--- loncom/automation/batchcreatecourse.pm	2007/07/02 03:36:47	1.22
+++ loncom/automation/batchcreatecourse.pm	2008/07/02 18:44:16	1.27
@@ -1,5 +1,5 @@
 #
-# $Id: batchcreatecourse.pm,v 1.22 2007/07/02 03:36:47 raeburn Exp $
+# $Id: batchcreatecourse.pm,v 1.27 2008/07/02 18:44:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -76,6 +76,8 @@ use strict;
 # <crsquota>20</crsquota>
 # <clonecrs>466011437c34194msul1</clonecrs>
 # <clonedom>msu</clonedom>
+# <datemode>shift</datemode>
+# <dateshift>365</dateshift>
 # <showphotos></showphotos>
 # <setpolicy>1</setpolicy>
 # <setcontent>1</setcontent>
@@ -219,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);
-                    if ($courseid =~ /^$match_courseid$/) {
+                    if ($courseid =~m{^/$match_domain/$match_courseid}) {
                         $$courseids{$courseid} = $details{$num}{'class'};
                     }
                 }
@@ -249,7 +251,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','crstype','crsquota');
+    my @items = ('title','optional_id','coursecode','coursehome','reshome','nonstandard','adds','drops','topmap','firstres','clonecrs','clonedom','datemode','dateshift','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
@@ -452,6 +454,10 @@ sub build_course {
     }
 
     if ($outcome eq 'ok') {
+        if ($$details{$num}{'datemode'} !~ /^(preserve|shift|delete)$/) {
+            $$details{$num}{'datemode'} = 'shift';
+            $$details{$num}{'dateshift'} = 365;
+        }
         my $courseargs = {
                ccuname => $$details{$num}{'owner'},
                ccdomain => $$details{$num}{'domain'},
@@ -465,6 +471,8 @@ sub build_course {
                crsquota => $$details{$num}{'crsquota'},
                clonecourse => $$details{$num}{'clonecrs'},
                clonedomain => $$details{$num}{'clonedom'},
+               datemode => $$details{$num}{'datemode'},
+               dateshift => $$details{$num}{'dateshift'},
                crsid => $$details{$num}{'optional_id'},
                curruser => $$details{$num}{'owner'},
                crssections => $sectionstr,
@@ -491,14 +499,16 @@ sub build_course {
                openall => $$details{$num}{'openall'},
                firstres => $firstres
                };
-
         my %host_servers = &Apache::lonnet::get_servers($cdom,'library');
         if (! exists($host_servers{$$details{$num}{'coursehome'}})) {
             $$logmsg .= &mt('Invalid home server for course').': '.$$details{$num}{'coursehome'};
             return;
         }
-
-        $$logmsg .= &Apache::loncommon::construct_course($courseargs,$logmsg,\$courseid,\$crsudom,\$crsunum,$udom,$uname,$context);
+        my ($success, $msg) = &Apache::loncommon::construct_course($courseargs,$logmsg,\$courseid,\$crsudom,\$crsunum,$udom,$uname,$context);
+	$$logmsg .= $msg;
+        if (!$success) {
+            return;
+        }
     } else {
         return;
     }
@@ -507,7 +517,7 @@ sub build_course {
 # Make owner a course coordinator
 #
     if (($owner_domain) && ($owner_uname)) {
-        &Apache::lonnet::assignrole($owner_domain,$owner_uname,$courseid,'cc');
+        &Apache::lonnet::assignrole($owner_domain,$owner_uname,$courseid,'cc','','','','',$context);
     }
 
 #