--- loncom/automation/batchcreatecourse.pm	2006/01/13 21:36:33	1.9
+++ loncom/automation/batchcreatecourse.pm	2006/05/30 20:05:10	1.13
@@ -1,5 +1,5 @@
 #
-# $Id: batchcreatecourse.pm,v 1.9 2006/01/13 21:36:33 raeburn Exp $
+# $Id: batchcreatecourse.pm,v 1.13 2006/05/30 20:05:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -166,7 +166,7 @@ use strict;
 #
 #                    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 
@@ -201,7 +201,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";
         }
@@ -629,15 +629,53 @@ sub process_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;
+        }
+        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;