Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/notifications/tcl/notification-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/notifications/tcl/notification-callback-procs.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/notifications/tcl/notification-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-procs.tcl,v
diff -u -r1.10.2.2 -r1.10.2.3
--- openacs-4/packages/notifications/tcl/notification-procs.tcl	7 Jul 2005 23:34:03 -0000	1.10.2.2
+++ openacs-4/packages/notifications/tcl/notification-procs.tcl	19 Jul 2005 22:38:47 -0000	1.10.2.3
@@ -345,34 +345,3 @@
         db_dml insert_notification_user_map {}
     }
 }
-
-
-ad_proc -callback merge::MergeShowUserInfo -impl notifications {
-    -user_id:required
-} {
-    Show the notifications of user_id
-} {
-    set result [list "Notifications of $user_id"]
-    set user_notifications [db_list_of_lists user_notification { *SQL* }]
-    lappend result $user_notifications
-    return $result
-}
-
-ad_proc -callback merge::MergePackageUser -impl notifications {
-    -from_user_id:required
-    -to_user_id:required
-} {
-    Merge the notifications of two users.
-} {
-    set msg "Merging notifications"
-    set result [list $msg]
-    ns_log Notice $msg
-    
-    db_transaction {
-	db_dml upd_notifications { *SQL* }
-	db_dml upd_map { *SQL* }
-	lappend result "Notifications merge is done"
-    } 
-    return $result
-}
-
Index: openacs-4/packages/notifications/tcl/notification-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-procs.xql,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/notifications/tcl/notification-procs.xql	15 Jun 2005 18:36:17 -0000	1.8.2.1
+++ openacs-4/packages/notifications/tcl/notification-procs.xql	19 Jul 2005 22:38:47 -0000	1.8.2.2
@@ -81,28 +81,4 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="callback::MergeShowUserInfo::impl::notifications.user_notification">
-        <querytext>	
-          select notification_id, notif_subject
-          from notifications
-          where notif_user  = :user_id
-        </querytext>
-    </fullquery>	
-
-    <fullquery name="callback::MergePackageUser::impl::notifications.upd_notifications">
-        <querytext>	
-          update notifications
-	  set notif_user  = :to_user_id
-   	  where notif_user = :from_user_id
-        </querytext>
-    </fullquery>	
-
-    <fullquery name="callback::MergePackageUser::impl::notifications.upd_map">
-        <querytext>	
-          update notification_user_map
-	  set user_id  = :to_user_id
-	  where user_id = :from_user_id
-        </querytext>
-    </fullquery>	
-
 </queryset>