Fisheye: Tag 1.1.2.3 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.1.3-2.2.0a1.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.1.3-2.2.0d1.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.1.4a1-2.2.0a3.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl,v
diff -u -r1.3.2.6 -r1.3.2.7
--- openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl	13 Mar 2006 00:46:52 -0000	1.3.2.6
+++ openacs-4/packages/dotlrn/tcl/apm-callback-procs.tcl	16 Mar 2006 01:42:51 -0000	1.3.2.7
@@ -154,7 +154,8 @@
 		    }
 		}
 	    }
-	    2.1.3 2.2.0a1 {
+	    2.2.0d1 2.2.0d2 {
+
 		#Setting the default Site Template
 		set site_template_id [db_string select_st_id "select site_template_id from dotlrn_site_templates where pretty_name = '#new-portal.sloan_theme_name#'"]
 		
Index: openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl,v
diff -u -r1.20.2.1 -r1.20.2.2
--- openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl	31 May 2005 23:13:07 -0000	1.20.2.1
+++ openacs-4/packages/dotlrn/www/admin/users-bulk-upload-2.tcl	16 Mar 2006 01:42:51 -0000	1.20.2.2
@@ -61,7 +61,7 @@
         ns_log Debug "%%% $row(email)"
 
         # We need to insert the ACS user
-        if {![info exists row(password)] || [empty_string_p $row(password)]} {
+        if {![info exists row(password)] || $row(password) eq ""} {
 
             # We need to insert the ACS user
             set password [ad_generate_random_string]
@@ -71,46 +71,45 @@
  
         # Check if this user already exists
         set user_id [cc_lookup_email_user $row(email)]
-        if {![empty_string_p $user_id]} {
+        if { $user_id ne "" } {
             doc_body_append [_ dotlrn.user_email_already_exists [list user_email $row(email)]]
             lappend list_of_user_ids $user_id
         } else {
 
-	
-	    set user_id [db_nextval acs_object_id_seq]
-
-            ns_log Debug "%%% $user_id"
-	
-	    auth::create_user \
-		-user_id $user_id \
-		-username "$row(username)" \
-		-email $row(email) \
-		-first_names $row(first_names) \
-		-last_name $row(last_name) \
-		-password $password
-            
-            lappend list_of_user_ids $user_id
-            
-            if {![info exists row(type)]} {
+            if {![info exists row(type)] || $row(type) eq ""} {
                 set row(type) student
             }
             
-            if {![info exists row(access_level)]} {
+            if {![info exists row(access_level)] || $row(access_level) eq ""} {
                 set row(access_level) full
             }
             
-            if {![info exists row(guest)]} {
+            if {![info exists row(guest)] || $row(guest) eq ""} {
                 set row(guest) f
             }
 
-            if {![info exists row(username)]} {
+            if {![info exists row(username)] || $row(username) eq ""} {
                 set row(username) $row(email)
             }
             
-            if {![info exists row(notify)]} {
+            if {![info exists row(notify)] || $row(notify) eq ""} {
                 set row(notify) f
 	    }
+	
+	    set user_id [db_nextval acs_object_id_seq]
 
+            ns_log Debug "%%% $user_id"
+	
+	    auth::create_user \
+		-user_id $user_id \
+		-username "$row(username)" \
+		-email $row(email) \
+		-first_names $row(first_names) \
+		-last_name $row(last_name) \
+		-password $password
+            
+            lappend list_of_user_ids $user_id
+
             ns_log Debug "%%% $row(username)...$row(access_level)...$row(type)"
 
             # Now we make them a dotLRN user
@@ -150,10 +149,12 @@
         }
 
         doc_body_append "<br>"
+        unset row
         
     }
-} on_error {
-    ns_log Error "The database choked while trying to create the last user in the list above! The transaction has been aborted, no users have been entered, and no e-mail notifications have been sent."
+} on_error  {
+    ns_log Error "The database choked while trying to create the last user in the list above! The transaction has been aborted, no users have been entered, and no e-mail notifications have been sent.\n
+$errmsg"
     doc_body_append [_ dotlrn.database_choked]
     ad_script_abort
 }