Index: openacs-4/packages/calendar-portlet/tcl/calendar-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/tcl/calendar-portlet-procs.tcl,v
diff -u -N -r1.19 -r1.20
--- openacs-4/packages/calendar-portlet/tcl/calendar-portlet-procs.tcl	23 Jan 2002 05:09:37 -0000	1.19
+++ openacs-4/packages/calendar-portlet/tcl/calendar-portlet-procs.tcl	11 Feb 2002 03:35:14 -0000	1.20
@@ -59,7 +59,7 @@
 
     ad_proc -public remove_self_from_page {
 	portal_id
-	community_id
+        package_id
     } {
 	  Removes a calendar PE from the given page
     
@@ -68,41 +68,13 @@
 	  @author arjun@openforce.net
 	  @creation-date Sept 2001
     } {
-        # it's more simple not to use portal::remove_element_or_remove_id here
-
-	# get the element IDs (could be more than one!)
-	set element_ids [portal::get_element_ids_by_ds $portal_id \
-		[my_name]]
-
-	# remove all elements
-	db_transaction {
-	    foreach element_id $element_ids {
-
-		set calendar_id \
-			[portal::get_element_param $element_id "calendar_id"]
-		
-		set g_cal_id \
-			[portal::get_element_param $element_id "group_calendar_id"]
-
-		# don't delete the public calendar!
-		if {[calendar_public_p $calendar_id] == "f"} {
-
-                ns_log notice "aks15 in calendar_portlet remove_self_from_page $calendar_id/$element_id/$g_cal_id"
-
-		    # delete the personal calendar associated with this element
-		    db_exec_plsql delete_calendar {
-			begin
-			calendar.delete(
-			calendar_id => :calendar_id
-			);
-			end;
-		    }
-		}
-		# get rid of this portal element
-		portal::remove_element $element_id
-	    }
-	}
-
+        ## YOWSA (ben)
+        # calendar portlet should NOT be creating and deleting calendars!
+        # I've taken out a chunk of code here that was removing calendars. No way! (ben).
+        
+        # get rid of this portal element
+        # This automatically removes all element params
+        portal::remove_element_or_remove_id -portal_id $portal_id -portlet_name [my_name] -key calendar_id -value_id $package_id
     }
 
 
Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	22 Jan 2002 04:10:12 -0000	1.2
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	11 Feb 2002 03:35:14 -0000	1.3
@@ -1,2 +1,4 @@
 <if @config.shaded_p@ ne "t">
 @cal_stuff@
+</if>
+<b>@list_of_calendar_ids@</b>
Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	23 Jan 2002 07:05:46 -0000	1.4
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	11 Feb 2002 03:35:14 -0000	1.5
@@ -29,7 +29,8 @@
     set cal_stuff [calendar::one_day_display \
             -item_template {<a href=calendar/?action=edit&cal_item_id=$item_id>$item</a>} \
             -hour_template "<a href=calendar/?date=$current_date&action=add&return_url=../&start_time=\$start_time&end_time=\$start_time>\$hour</a>" \
-            -date $current_date -start_hour 7 -end_hour 22]
+            -date $current_date -start_hour 7 -end_hour 22 \
+            -calendar_id_list $list_of_calendar_ids]
     
 }