Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `openacs-4/packages/calendar/tcl/calendar-callback-procs.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/calendar/tcl/calendar-callback-procs.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/calendar/tcl/calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs.tcl,v
diff -u -r1.25.2.4 -r1.25.2.5
--- openacs-4/packages/calendar/tcl/calendar-procs.tcl	7 Jul 2005 23:00:17 -0000	1.25.2.4
+++ openacs-4/packages/calendar/tcl/calendar-procs.tcl	19 Jul 2005 16:49:36 -0000	1.25.2.5
@@ -15,82 +15,6 @@
 namespace eval calendar {}
 namespace eval calendar::notification {}
 
-ad_proc -callback merge::MergeShowUserInfo -impl calendar {
-    -user_id:required
-} {
-    Shows the calendar tables user info
-} {
-    set msg "Calendars of user_id: $user_id"
-    set return_msg [list $msg]
-    
-    set cals [db_list get_calendars {*SQL*} ]
-    if { [empty_string_p $cals ] } {
-	lappend return_msg "none"
-    } else {
-	lappend return_msg $cals
-    }
-    
-    return $return_msg
-}
-
-ad_proc -callback merge::MergePackageUser -impl calendar {
-    -from_user_id:required
-    -to_user_id:required
-} {
-    Merge the calendars of two users.
-    The from_user_id is the user_id of the user
-    that will be deleted and all the calendar elements
-    of this user will be mapped to the to_user_id.
-} {
-    set msg "Merging calendar"
-    ns_log Notice $msg
-    set return_msg [list $msg]
-    
-    set from_calendars [db_list_of_lists get_from_calendars {*SQL*} ]
-    db_transaction {
-	ns_log Notice "  Entering to calendar transaction"
-	foreach calendar $from_calendars {
-	    # l_* vars will represent
-	    # each item of the from_user_id list of lists
-	    set l_cal_id [lindex $calendar 0]
-	    set l_pkg_id [lindex $calendar 1]
-	    
-	    # if the pkg_id of this cal_id is the
-	    # the same for some to_user_id cal
-	    # we have to delete it, else we must 
-	    # change the items from one cal to the other one
-	    if { [db_string get_repeated_pkgs {*SQL*} ] } {
-		# We will move the cal items if the 
-		# calendars are of the same type (package_id)
-		set to_cal_id [db_string gettocalid {*SQL*} ]
-		
-		db_dml calendar_items_upd { *SQL* }
-		
-		# ns_log Notice "  Deleting calendar"
-		# TODO: calendar::delete -calendar_id $l_cal_i is broken
-		# so, we will delete directly from the calendars table
-		db_dml del_from_cal { *SQL* }
-		
-	    } else {
-		ns_log Notice "  Change owner of $calendar"
-		# change the owner
-		db_dml calendars_upd { *SQL* }
-	    }
-	}
-	set msg "  Calendar merge is done"
-	ns_log Notice $msg
-	lappend return_msg $msg
-    }
-    # I commented this section to avoid partial merges
-    # If something is wrong the merge should be stopped.
-    #        on_error {
-    # 	    set msg "  I couldn't merge calendar. The error was $errmsg"
-    # 	    ns_log Notice $msg
-    # 	    lappend return_msg $msg
-    # 	}
-    return $return_msg
-}
-
 ad_proc calendar::make_datetime {
     event_date
     {event_time ""}
Index: openacs-4/packages/calendar/tcl/calendar-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs.xql,v
diff -u -r1.6.6.3 -r1.6.6.4
--- openacs-4/packages/calendar/tcl/calendar-procs.xql	23 Jun 2005 16:44:06 -0000	1.6.6.3
+++ openacs-4/packages/calendar/tcl/calendar-procs.xql	19 Jul 2005 16:49:36 -0000	1.6.6.4
@@ -82,63 +82,5 @@
       </querytext>
 </fullquery>
 
-  <fullquery name="callback::MergeShowUserInfo::impl::calendar.get_calendars">
-    <querytext>	
-	select calendar_name
-	from calendars
-	where owner_id = :user_id
-    </querytext>
-  </fullquery>	
-
-  <fullquery name="callback::MergePackageUser::impl::calendar.get_from_calendars">
-    <querytext>	
-	select calendar_id,package_id
-	from calendars
-	where owner_id = :from_user_id
-    </querytext>
-  </fullquery>	
-  
-  <fullquery name="callback::MergePackageUser::impl::calendar.get_repeated_pkgs">
-    <querytext>	
-      select count(*)
-      from calendars
-      where owner_id = :to_user_id
-      and package_id = :l_pkg_id
-    </querytext>
-  </fullquery>	
-
-  <fullquery name="callback::MergePackageUser::impl::calendar.calendars_upd">
-    <querytext>	
-      update calendars
-      set owner_id = :to_user_id
-      where owner_id = :from_user_id
-      and calendar_id = :l_cal_id
-    </querytext>
-  </fullquery>	
-
-  <fullquery name="callback::MergePackageUser::impl::calendar.gettocalid">
-    <querytext>	
-      select calendar_id 
-      from calendars 
-      where package_id = :l_pkg_id 
-      and owner_id = :to_user_id
-    </querytext>
-  </fullquery>	
-
-  <fullquery name="callback::MergePackageUser::impl::calendar.calendar_items_upd">
-    <querytext>	
-      update cal_items 
-      set on_which_calendar = :to_cal_id
-      where on_which_calendar = :l_cal_id
-    </querytext>
-  </fullquery>	
-
-  <fullquery name="callback::MergePackageUser::impl::calendar.del_from_cal">
-    <querytext>	
-      delete
-      from calendars
-      where calendar_id = :l_cal_id
-    </querytext>
-  </fullquery>	
 	
 </queryset>