--- loncom/interface/loncoursedata.pm	2002/07/24 14:52:32	1.4
+++ loncom/interface/loncoursedata.pm	2002/07/25 21:23:51	1.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: loncoursedata.pm,v 1.4 2002/07/24 14:52:32 stredwic Exp $
+# $Id: loncoursedata.pm,v 1.6 2002/07/25 21:23:51 stredwic Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -106,16 +106,16 @@ sub DownloadClasslist {
     my ($courseDomain,$courseNumber)=split(/\_/,$courseID);
     my %classlist;
 
-    my $modifiedTime = &GetFileTimestamp($courseDomain, $courseNumber,
-                                     'classlist.db', 
-                                     $Apache::lonnet::perlvar{'lonUsersDir'});
-
-    if($lastDownloadTime ne 'Not downloaded' &&
-       $lastDownloadTime >= $modifiedTime && $modifiedTime >= 0) {
-        $classlist{'lastDownloadTime'}=time;
-        $classlist{'UpToDate'} = 'true';
-        return \%classlist;
-    }
+#    my $modifiedTime = &GetFileTimestamp($courseDomain, $courseNumber,
+#                                     'classlist.db', 
+#                                     $Apache::lonnet::perlvar{'lonUsersDir'});
+
+#    if($lastDownloadTime ne 'Not downloaded' &&
+#       $lastDownloadTime >= $modifiedTime && $modifiedTime >= 0) {
+#        $classlist{'lastDownloadTime'}=time;
+#        $classlist{'UpToDate'} = 'true';
+#        return \%classlist;
+#    }
 
     %classlist=&Apache::lonnet::dump('classlist',$courseDomain, $courseNumber);
     my ($checkForError)=keys (%classlist);
@@ -186,14 +186,14 @@ sub DownloadCourseInformation {
     my %courseData;
     my ($name,$domain) = split(/\:/,$namedata);
 
-    my $modifiedTime = &GetFileTimestamp($domain, $name,
-                                      $courseID.'.db', 
-                                      $Apache::lonnet::perlvar{'lonUsersDir'});
-    if($lastDownloadTime >= $modifiedTime) {
-        $courseData{'lastDownloadTime'}=time;
-        $courseData{'UpToDate'} = 'true';
-        return \%courseData;
-    }
+#    my $modifiedTime = &GetFileTimestamp($domain, $name,
+#                                      $courseID.'.db', 
+#                                      $Apache::lonnet::perlvar{'lonUsersDir'});
+#    if($lastDownloadTime >= $modifiedTime) {
+#        $courseData{'lastDownloadTime'}=time;
+#        $courseData{'UpToDate'} = 'true';
+#        return \%courseData;
+#    }
 
     # Download course data
     %courseData=&Apache::lonnet::dump($courseID, $domain, $name);
@@ -515,6 +515,7 @@ sub ProcessClasslist {
         $cache->{$name.':domain'}=$studentDomain;
         if(!defined($cache->{$name.':lastDownloadTime'})) {
             $cache->{$name.':lastDownloadTime'}='Not downloaded';
+            $cache->{$name.':updateTime'}=' Not updated';
         }
 
         my ($checkForError)=keys(%$studentInformation);
@@ -604,6 +605,12 @@ sub ProcessStudentData {
 
     if($courseData->{'UpToDate'} eq 'true') {
         $cache->{$name.':lastDownloadTime'}=$courseData->{'lastDownloadTime'};
+        if($courseData->{'lastDownloadTime'} eq 'Not downloaded') {
+            $cache->{$name.':updateTime'} = ' Not updated';
+        } else {
+            $cache->{$name.':updateTime'}=
+                localtime($courseData->{'lastDownloadTime'});
+        }
         return;
     }
 
@@ -617,6 +624,12 @@ sub ProcessStudentData {
     }
 
     $cache->{$name.':lastDownloadTime'}=$courseData->{'lastDownloadTime'};
+    if($courseData->{'lastDownloadTime'} eq 'Not downloaded') {
+        $cache->{$name.':updateTime'} = ' Not updated';
+    } else {
+        $cache->{$name.':updateTime'}=
+            localtime($courseData->{'lastDownloadTime'});
+    }
     foreach (@courseKeys) {
         $cache->{$name.':'.$_}=$courseData->{$_};
     }
@@ -625,30 +638,27 @@ sub ProcessStudentData {
 }
 
 sub LoadDiscussion {
-#    my $symb=shift;
-#    $r->print('<br>$cid ... '.$symb);
-#    my %contrib=&Apache::lonnet::dump('msu_2964385f9033c63msul1','msu','2964385f9033c63msul1');
-    my ($name, $courseID, $Discuss)=@_;
-    my %contrib=&DownloadCourseInformation($name, $courseID, 0);
-				                            
+    my ( $courseID)=@_;
+    my %Discuss=();
+    my %contrib=&Apache::lonnet::dump(
+                $courseID,
+                $ENV{'course.'.$courseID.'.domain'},
+                $ENV{'course.'.$courseID.'.num'});
+				 
+    #my %contrib=&DownloadCourseInformation($name, $courseID, 0);
+
     foreach my $temp(keys %contrib) {
 	if ($temp=~/^version/) {
 	    my $ver=$contrib{$temp};
 	    my ($dummy,$prb)=split(':',$temp);
 	    for (my $idx=1; $idx<=$ver; $idx++ ) {
 		my $name=$contrib{"$idx:$prb:sendername"};
-		$Discuss->{"$name:$prb"}=$idx;	
+		$Discuss{"$name:$prb"}=$idx;	
 	    }
 	}
     }       
-#   $r->print('<br>cid='.$cid);
-#    my %contrib=&Apache::lonnet::restore($symb,$cid,
-#					 $ENV{$cid.'.domain'},
-#					 $ENV{'course.'.$cid.'.num'});
-
-#    $Apache::lonxml::debug=1;
-#    &Apache::lonhomework::showhash(%Discuss);
-#    $Apache::lonxml::debug=0;
+
+    return \%Discuss;
 }
 
 # ----- END PROCESSING FUNCTIONS ---------------------------------------