--- loncom/automation/batchcreatecourse.pm	2005/07/11 20:02:02	1.6
+++ loncom/automation/batchcreatecourse.pm	2006/01/13 21:36:33	1.9
@@ -1,5 +1,5 @@
 #
-# $Id: batchcreatecourse.pm,v 1.6 2005/07/11 20:02:02 raeburn Exp $
+# $Id: batchcreatecourse.pm,v 1.9 2006/01/13 21:36:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,8 @@ use Apache::loncreatecourse;
 use Apache::loncreateuser;
 use Apache::lonlocal;
 
+use strict;
+
 # Collection of routines used for batch creation of courses and users.
 # &create_courses() should be called by an Autocreate.pl
 # script via a cron entry, or alternatively from a web page, after upload 
@@ -184,7 +186,7 @@ sub create_courses {
     my $perlvarref = LONCAPA::Configuration::read_conf('loncapa.conf');
 # Get role names
     my %longroles = ();
-    open(FILE,"<$perlvarref{'lonTabDir'}.'/rolesplain.tab");
+    open(FILE,"<$$perlvarref{'lonTabDir'}.'/rolesplain.tab");
     my @rolesplain = <FILE>;
     close(FILE);
     foreach (@rolesplain) {
@@ -376,7 +378,7 @@ sub parse_coursereqs {
 #########################################################
 
 sub build_course {
-    my ($cdom,$num,$context,$details,$longoles,$logmsg,$newusermsg,$addresult,$enrollcount,$output,$keysmsg,$udom,$uname) = @_;
+    my ($cdom,$num,$context,$details,$longroles,$logmsg,$newusermsg,$addresult,$enrollcount,$output,$keysmsg,$udom,$uname) = @_;
     my $owner_uname = $$details{$num}{'owner'};
     my $owner_domain = $$details{$num}{'domain'};
     my $owner = $owner_uname.':'.$owner_domain;
@@ -420,13 +422,13 @@ 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'},
-                    'middle' => $$details{$num}{'users'}{$owner}{'middle'},
-                    'last' => $$details{$num}{'users'}{$owner}{'last'},
-                    'gene' => $$details{$num}{'users'}{$owner}{'gene'},
+                    'pid' => $$details{$num}{'users'}{$owner}{'studentID'},
+                    'first' => $$details{$num}{'users'}{$owner}{'firstname'},
+                    'middle' => $$details{$num}{'users'}{$owner}{'middlename'},
+                    'last' => $$details{$num}{'users'}{$owner}{'lastname'},
+                    'gene' => $$details{$num}{'users'}{$owner}{'generation'},
                     'usec' => '',
                     'end' => '',
                     'start' => '',
@@ -469,7 +471,7 @@ sub build_course {
                enrollend => $$details{$num}{'enrollend'},
                startaccess => $$details{$num}{'accessstart'},
                endaccess => $$details{$num}{'accessend'},
-               setpolicy => $Sdetails{$num}{'setpolicy'},
+               setpolicy => $$details{$num}{'setpolicy'},
                setcontent => $$details{$num}{'setcontent'},
                reshome => $reshome,
                setkeys => $$details{$num}{'setkeys'},
@@ -508,23 +510,25 @@ 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],