--- loncom/interface/loncoursedata.pm	2003/01/10 21:50:17	1.41
+++ loncom/interface/loncoursedata.pm	2003/02/05 01:39:32	1.44
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: loncoursedata.pm,v 1.41 2003/01/10 21:50:17 matthew Exp $
+# $Id: loncoursedata.pm,v 1.44 2003/02/05 01:39:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -218,7 +218,8 @@ sub DownloadCourseInformation {
                                       $courseID.'.db', 
                                       $Apache::lonnet::perlvar{'lonUsersDir'});
 
-    if($lastDownloadTime >= $modifiedTime && $modifiedTime >= 0) {
+    if($lastDownloadTime ne 'Not downloaded' && 
+       $lastDownloadTime >= $modifiedTime && $modifiedTime >= 0) {
         # Data is not gathered so return UpToDate as true.  This
         # will be interpreted in ProcessClasslist
         $courseData{$namedata.':lastDownloadTime'}=time;
@@ -521,7 +522,7 @@ sub ProcessTopResourceMap {
             $errorMessage .= 'loncoursedata::ProcessTopLevelMap.';
             $errorMessage .= "  bighash to_$currentResourceID not defined!";
             &Apache::lonnet::logthis($errorMessage);
-	    last;
+	    if (!defined($currentResourceID)) {last;}
 	}
 	my @nextResources=();
 	foreach (split(/\,/,$hash{'to_'.$currentResourceID})) {
@@ -1180,7 +1181,7 @@ sub DownloadStudentCourseData {
     my $WhatIWant;
     $WhatIWant = '(^version:|';
     $WhatIWant .= '^\d+:.+?:(resource\.\d+\.';
-    $WhatIWant .= '(solved|tries|previous|awarded|(\d+\.submission))\s*$';
+    $WhatIWant .= '(solved|tries|previous|awarded|(\d+\.submission))\s*$';#'
     $WhatIWant .= '|timestamp)';
     $WhatIWant .= ')';
 #    $WhatIWant = '.';