Index: openacs-4/packages/assessment/tcl/as-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-callback-procs.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/assessment/tcl/as-callback-procs.tcl	10 Jun 2005 18:53:30 -0000	1.1.2.2
+++ openacs-4/packages/assessment/tcl/as-callback-procs.tcl	19 Jul 2005 16:58:31 -0000	1.1.2.3
@@ -14,3 +14,50 @@
 			-community_id $community_id]
 	}
 }
+
+ad_proc -callback merge::MergeShowUserInfo -impl as {
+    -user_id:required
+} {
+    Shows assessments items	
+} {
+    set msg "Assessment items of user $user_id"
+    set result [list $msg]
+
+    lappend result [list "Staff of sessions: [db_list sel_sessions { *SQL* }] "]
+    lappend result [list "Subject of sessions: [db_list sel_sessions2 {*SQL*}] "]
+
+    lappend result [list "Subject of section data id: [db_list sel_sections { *SQL* }] "]
+    lappend result [list "Staff of section data id: [db_list sel_sections2 { *SQL* }] "]
+
+    lappend result [list "Subject of item data id : [db_list sel_items { *SQL* }] "]
+    lappend result [list "Staff of item_data_id: [db_list sel_items2 { *SQL* }] "]
+    
+    return $result
+}
+
+ad_proc -callback merge::MergePackageUser -impl as {
+    -from_user_id:required
+    -to_user_id:required
+} {
+    Merge the as's of two users.
+    The from_user_id is the user that will be 
+    deleted and all the entries of this user 
+    will be mapped to the to_user_id.
+    
+} {
+    set msg "Merging assesment"
+    set result [list $msg]
+    ns_log Notice $msg
+    db_transaction {
+	db_dml upd_from_sessions { *SQL* }
+	db_dml upd_from_sessions2 { *SQL* }
+	db_dml upd_from_sections { *SQL* }
+	db_dml upd_from_sections2 { *SQL* }
+	db_dml upd_from_items { *SQL* }
+	db_dml upd_from_items2 { *SQL* }
+	
+    }
+    lappend result "assessment merge is done"
+    return $result
+}
+