Index: openacs-4/packages/lorsm/tcl/lorsm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm/tcl/lorsm-procs.tcl,v
diff -u -N -r1.6.2.3 -r1.6.2.4
--- openacs-4/packages/lorsm/tcl/lorsm-procs.tcl	17 Jun 2005 00:13:30 -0000	1.6.2.3
+++ openacs-4/packages/lorsm/tcl/lorsm-procs.tcl	7 Jul 2005 23:17:12 -0000	1.6.2.4
@@ -654,42 +654,41 @@
 }
 
 
-namespace eval lorsm::merge {
 
-    ad_proc -callback MergeShowUserInfo -impl lorsm {
-	-user_id:required
-    } {
-	Show lors items of one user
-    } {
-	set msg "lors items"
-	set result [list $msg]
 
-	lappend result [list "Student tracks : [db_list sel_student_track { *SQL* }] " ]
-	lappend result [list "Student bookmarks: [db_list sel_student_bookmark { *SQL* }] "]
-	
-	return $result
-    }
+ad_proc -callback merge::MergeShowUserInfo -impl lorsm {
+    -user_id:required
+} {
+    Show lors items of one user
+} {
+    set msg "lors items"
+    set result [list $msg]
 
-    ad_proc -callback MergePackageUser -impl lorsm {
-	-from_user_id:required
-	-to_user_id:required
-    } {
-	Merge the lors items 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 lors"
-	ns_log Notice $msg
-	set result [list $msg]
+    lappend result [list "Student tracks : [db_list sel_student_track { *SQL* }] " ]
+    lappend result [list "Student bookmarks: [db_list sel_student_bookmark { *SQL* }] "]
+    
+    return $result
+}
 
-	db_transaction {
-	    db_dml student_track { *SQL* }
-	    db_dml student_bookmark { *SQL* }
-	}
+ad_proc -callback merge::MergePackageUser -impl lorsm {
+    -from_user_id:required
+    -to_user_id:required
+} {
+    Merge the lors items 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 lors"
+    ns_log Notice $msg
+    set result [list $msg]
 
-	set result "lors merge is done"
-	return $result
+    db_transaction {
+	db_dml student_track { *SQL* }
+	db_dml student_bookmark { *SQL* }
     }
-}
\ No newline at end of file
+
+    set result "lors merge is done"
+    return $result
+}