--- loncom/automation/batchcreatecourse.pm	2005/04/07 03:58:02	1.4
+++ loncom/automation/batchcreatecourse.pm	2006/07/08 17:29:24	1.16
@@ -1,5 +1,5 @@
 #
-# $Id: batchcreatecourse.pm,v 1.4 2005/04/07 03:58:02 albertel Exp $
+# $Id: batchcreatecourse.pm,v 1.16 2006/07/08 17:29:24 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 
@@ -54,6 +56,7 @@ use Apache::lonlocal;
 #<!DOCTYPE text>
 #<class id="ss05ubw101">
 # <title>Underwater Basket Weaving</title>
+# <crstype>Course</crstype>
 # <coursecode>ss05ubw101</coursecode>
 # <coursehome>msul1</coursehome>
 # <coursedomain>msu</coursedomain>
@@ -72,6 +75,7 @@ use Apache::lonlocal;
 # <nonstandard></nonstandard>
 # <topmap></topmap>
 # <firstres>nav</firstres>
+# <crsquota>20</crsquota>
 # <clonecrs>466011437c34194msul1</clonecrs>
 # <clonedom>msu</clonedom>
 # <showphotos></showphotos>
@@ -152,8 +156,14 @@ use Apache::lonlocal;
 # A value of 0 or blank is equivalent to an unchecked box or 'No'
 # response. Dates are in format YYYY:MM:DD:HH:MM:SS (:separators required)
 #
-# firstres can be nav, syl , or blank for "Navigate Contents", Syllabus, or
+# firstres can be nav, syl, or blank for "Navigate Contents", Syllabus, or
 # no entry respectively.
+# 
+# crstype can be Course or Group
+#
+# crsquota is the total disk space permitted for course group portfolio files
+# in all course groups.
+# 
 # For format of other parameters, refer to the interactive CCRS page
 # and view how the equivalent parameter is displayed in the web form.  
 #  
@@ -164,7 +174,7 @@ use Apache::lonlocal;
 #
 #                    Directory for retrieval of files listed in @$requests is: 
 #                    /home/httpd/perl/tmp/addcourse/$dom/auto/pending if $context = auto
-#                    /home/httpd/perl/tmp/addcourse/$dom/web/$udom_$uname if $context = web
+#                    /home/httpd/perl/tmp/addcourse/$dom/web/$uname_$udom/pending if $context = web
 #                    
 # inputs (five)  -  requests - ref to array of filename(s) containing course requests 
 #                   courseids - ref to hash to store LON-CAPA course ids of new courses 
@@ -184,7 +194,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) {
@@ -199,7 +209,7 @@ sub create_courses {
         $newcoursedir .= '/pending';
     } else {
         if ($uname && $udom) {
-            $newcoursedir .= '/'.$udom.'_'.$uname;
+            $newcoursedir .= '/'.$uname.'_'.$udom.'/pending';
         } else {
             $logmsg = "batchcreatecourse::create_courses() called without username and/or domain of requesting Domain Coordinator";
         }
@@ -211,7 +221,7 @@ sub create_courses {
                 &parse_coursereqs($newcoursedir.'/'.$request, \%details);
                 foreach my $num (sort keys %details) {
                     my $courseid = &build_course($dom,$num,$context,\%details,\%longroles,\$logmsg,\$newusermsg,\$addresult,\%enrollcount,\$output,\$keysmsg);
-                    $$courseids{$courseid} = $enrollcount;
+                    $$courseids{$courseid} = $details{$num}{'class'};
                 }
             }
         }
@@ -239,7 +249,7 @@ sub parse_coursereqs {
     my $xlist = 0;
     my $userkey = '';
     my $role = '';
-    my @items = ('title','optional_id','coursecode','coursehome','reshome','nonstandard','adds','drops','topmap','firstres','clonecrs','clonedom','showphotos','setpolicy','setcontent','setkeys','keyauth','disresdis','disablechat','openall','notify_owner','notify_dc');
+    my @items = ('title','optional_id','coursecode','coursehome','reshome','nonstandard','adds','drops','topmap','firstres','clonecrs','clonedom','showphotos','setpolicy','setcontent','setkeys','keyauth','disresdis','disablechat','openall','notify_owner','notify_dc','crstype','crsquota');
     my @dateitems = ('enrollstart','enrollend','accessstart','accessend');
     my @useritems = ('autharg','authtype','firstname','generation','lastname','middlename','studentID');
     my $p = HTML::Parser->new
@@ -292,7 +302,7 @@ sub parse_coursereqs {
                  } elsif ("@state" eq "class owner authtype") {
                     $$details{$num}{'ownerauthtype'} = $text;
                  } elsif ("@state" eq "class owner autharg") {
-                    $$details{$num}{'ownerautharg'} = $text;
+                    $$details{$num}{'ownerauthparam'} = $text;
                  } elsif ("@state" eq "class authentication method") {
                     $$details{$num}{'authtype'} = $text;
                  } elsif ("@state" eq "class authentication param") {
@@ -350,9 +360,6 @@ sub parse_coursereqs {
 
     $p->parse_file($coursefile);
     $p->eof;
-    if (-e "$coursefile") {
-#        unlink $coursefile;
-    }
     return;
 }
 
@@ -379,7 +386,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;
@@ -406,28 +413,30 @@ sub build_course {
         $firstres = 'syl';
     }
     foreach my $secid (sort keys %{$$details{$num}{'sections'}}) {
-        $sectionstr .= $$details{$num}{'sections'}{$secid}{'inst'}.':'.$$details{$num}{'sections'}{$secid}{'loncapa'};
+        $sectionstr .= $$details{$num}{'sections'}{$secid}{'inst'}.':'.$$details{$num}{'sections'}{$secid}{'loncapa'}.',';
     }
+    $sectionstr =~ s/,$//;
 
     foreach my $xlist (sort keys %{$$details{$num}{'crosslists'}}) {
-        $xliststr .= $$details{$num}{'crosslists'}{$xlist}{'inst'}.':'.$$details{$num}{'crosslists'}{$xlist}{'loncapa'};
+        $xliststr .= $$details{$num}{'crosslists'}{$xlist}{'inst'}.':'.$$details{$num}{'crosslists'}{$xlist}{'loncapa'}.',';
     }
+    $xliststr =~ s/,$//;
 
     my %courseinfo = (
                       inst_code => $$details{$num}{'coursecode'},
                       description => $$details{$num}{'title'}
                      ); 
     if (&Apache::lonnet::homeserver($$details{$num}{'owner'},$$details{$num}{'domain'}) eq 'no_host') { # Add user if no account
-        my $ownerargs = ('auth' => $$details{$num}{'ownerauthtype'},
+        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' => '',
@@ -435,22 +444,25 @@ sub build_course {
                     'cid' => '',
                     'context' => 'createowner',
                     'linefeed' => $linefeed,
-                    'role' => 'cc'
-                   );
-        $outcome = &LONCAPA::Enrollment::create_newuser($ownerargs,$logmsg,$newusermsg,$enrollcount,$addresult,$longroles,$courseinfo);
+                    'role' => 'cc',
+                   };
+        $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'},
+               crstype => $$details{$num}{'crstype'},
                curl => $$details{$num}{'topmap'},
                course_domain => $cdom,
                course_home =>  $$details{$num}{'coursehome'},
                nonstandard => $$details{$num}{'nonstandard'},
                crscode => $$details{$num}{'coursecode'},
+               crsquota => $$details{$num}{'crsquota'},
                clonecourse => $$details{$num}{'clonecrs'},
                clonedomain => $$details{$num}{'clonedom'},
                crsid => $$details{$num}{'optional_id'},
@@ -469,7 +481,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'},
@@ -480,7 +492,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'};
@@ -509,27 +520,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 $userargs = ('auth' => $$details{$num}{'users'}{$userkey}{'authtype'},
-                    'authparam' => $$details{$num}{'users'}{$userkey}{'authparam'},
+                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)) {
@@ -587,13 +601,11 @@ sub build_course {
                                 if ($usec ne '') {
                                     $url .= '/'.$usec;
                                 }
-                                $$output .= &Apache::loncreateuser::commit_standardrole($userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,$usec);
-                                $url = '/'.$crsudom.'/'.$crsunum;
-                                if ($usec ne '') {
-                                    $url .= '/'.$usec;
-                                }
+                                my $stdresult = &Apache::loncreateuser::commit_standardrole($userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,$usec);
+                                $$output .= $stdresult;
                             }
                         } else {
+                            $url = '/'.$crsudom.'/'.$crsunum;
                             $$output .= &Apache::loncreateuser::commit_standardrole($userdom,$username,$url,$curr_role,$start,$end,$crsudom,$crsunum,'');
                         }
                     }
@@ -624,16 +636,56 @@ sub build_course {
 sub process_date {
     my $timestr = shift;
     my $timestamp = '';
-    if ($timestr eq "No end date") {
+    if ($timestr !~ /:/) {
         $timestamp = '';
     } else {
-        my @entries = split/:/,$timestr;
+        my @entries = split(/:/,$timestr);
         for (my $j=0; $j<@entries; $j++) {
             if ( length($entries[$j]) > 1 ) {
                 $entries[$j] =~ s/^0//;
             }
+            $entries[$j] =~ s/\D//g;
+            if ($entries[$j] < 0) {
+                $entries[$j] = 0;
+            }
+        }
+        if ($entries[1] > 0) {  
+            $entries[1] = $entries[1] - 1;
+        }
+        if ($entries[5] > 60) {
+            $entries[5] = 60;
+        }
+        if ($entries[4] > 59) {
+            $entries[4] = 59;
+        }
+        if ($entries[3] > 23) {
+            $entries[3] = 23;
+        }
+        if ($entries[2] > 31) {
+            $entries[2] = 31;
         }
-        $entries[1] = $entries[1] - 1;
+        if ($entries[1] > 11) {
+            $entries[1] = 11;
+        }
+        if ($entries[2] == 31) {
+            if (($entries[1] == 3) || ($entries[1] == 5) ||
+                ($entries[1] == 8) || ($entries[1] == 10)) {
+                $entries[2] = 30;
+            }
+        }
+        if ($entries[1] == 1) {
+            if ($entries[2] > 29) {
+                $entries[2] = 29;
+            }
+            if ($entries[2] == 29) {
+                if ($entries[0]%4 != 0) {
+                    $entries[2] = 28;
+                } elsif ( $entries[0]%100 == 0
+			  && $entries[0]%400 != 0) {
+		    $entries[2] = 28;
+		}
+            }
+        }     
         $timestamp =  timelocal($entries[5],$entries[4],$entries[3],$entries[2],$entries[1],$entries[0]);
     }
     return $timestamp;