--- loncom/automation/batchcreatecourse.pm	2005/06/01 19:20:32	1.5
+++ loncom/automation/batchcreatecourse.pm	2005/08/31 06:31:22	1.8
@@ -1,5 +1,5 @@
 #
-# $Id: batchcreatecourse.pm,v 1.5 2005/06/01 19:20:32 raeburn Exp $
+# $Id: batchcreatecourse.pm,v 1.8 2005/08/31 06:31:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -420,7 +420,7 @@ sub build_course {
         my $ownerargs = {'auth' => $$details{$num}{'ownerauthtype'},
                     'authparam' => $$details{$num}{'ownerauthparam'},
                     'emailenc' => $$details{$num}{'emailenc'},
-                    'dom' => $$details{$num}{'domain'},
+                    'udom' => $$details{$num}{'domain'},
                     'uname' => $$details{$num}{'owner'},
                     'pid' => '',
                     'first' => $$details{$num}{'users'}{$owner}{'first'},
@@ -436,12 +436,13 @@ sub build_course {
                     'linefeed' => $linefeed,
                     'role' => 'cc',
                    };
-        $outcome = &LONCAPA::Enrollment::create_newuser($ownerargs,$logmsg,$newusermsg,$enrollcount,$addresult,$longroles,$courseinfo);
+        $outcome = &LONCAPA::Enrollment::create_newuser($ownerargs,$logmsg,$newusermsg,$enrollcount,$addresult,$longroles,\%courseinfo);
     } else {
         $outcome = 'ok';
     }
 
-    my $courseargs = {
+    if ($outcome eq 'ok') {
+        my $courseargs = {
                ccuname => $$details{$num}{'owner'},
                ccdomain => $$details{$num}{'domain'},
                cdescr => $$details{$num}{'title'},
@@ -479,7 +480,6 @@ sub build_course {
                firstres => $firstres
                };
 
-    if ($outcome eq 'ok') {
         my %host_servers = &Apache::loncommon::get_library_servers($cdom);
         if (! exists($host_servers{$$details{$num}{'coursehome'}})) {
             $$logmsg .= &mt('Invalid home server for course').': '.$$details{$num}{'coursehome'};
@@ -508,28 +508,30 @@ sub build_course {
             my ($username,$userdom) = split/:/,$userkey;
             if (&Apache::lonnet::homeserver($username,$userdom) eq 'no_host') { # Add user if no account
                 my $firstrole = $$details{$num}{'users'}{$userkey}{'roles'}[0];
-                my $firssec = $$details{$num}{'users'}{$userkey}{$firstrole}{'usec'}[0];
+                my $firstsec = $$details{$num}{'users'}{$userkey}{$firstrole}{'usec'}[0];
                 my $userargs = {
                     'auth' => $$details{$num}{'users'}{$userkey}{'authtype'},
                     'authparam' => $$details{$num}{'users'}{$userkey}{'autharg'},
                     'emailenc' => $$details{$num}{'users'}{$userkey}{'emailenc'},
-                    'dom' => $userdom,
+                    'udom' => $userdom,
                     'uname' => $username,
                     'pid' => $$details{$num}{'users'}{$userkey}{'studentID'},
-                    'first' => $$details{$num}{'users'}{$userkey}{'first'},
-                    'middle' => $$details{$num}{'users'}{$userkey}{'middle'},
-                    'last' => $$details{$num}{'users'}{$userkey}{'last'},
-                    'gene' => $$details{$num}{'users'}{$userkey}{'gene'},
+                    'first' => $$details{$num}{'users'}{$userkey}{'firstname'},
+                    'middle' => $$details{$num}{'users'}{$userkey}{'middlename'},
+                    'last' => $$details{$num}{'users'}{$userkey}{'lastname'},
+                    'gene' => $$details{$num}{'users'}{$userkey}{'generation'},
                     'usec' => $firstsec,
                     'end' => $$details{$num}{'users'}{$userkey}{'end'},
                     'start' => $$details{$num}{'users'}{$userkey}{'start'},
-                    'emailaddr' => $$details{$num}{'users'}{$userkey}{'email'},
+                    'emailaddr' => $$details{$num}{'users'}{$userkey}{'emailaddr'},
                     'cid' => $courseid,
+                    'crs' => $crsunum,
+                    'cdom' => $crsudom,
                     'context' => 'createcourse',
                     'linefeed' => $linefeed,
                     'role' => $$details{$num}{'users'}{$userkey}{'roles'}[0], 
                    };
-                $outcome = &LONCAPA::Enrollment::create_newuser($userargs,$logmsg,$newusermsg,$enrollcount,$addresult,$longroles,$courseinfo);
+                $outcome = &LONCAPA::Enrollment::create_newuser($userargs,$logmsg,$newusermsg,$enrollcount,$addresult,$longroles,\%courseinfo);
 # now add other roles and other sections.
                 if ($outcome eq 'ok') {
                     if (($firstrole ne 'st') && (@{$$details{$num}{'users'}{$userkey}{$firstrole}{'usec'}} > 1)) {