--- loncom/interface/loncoursedata.pm	2002/07/22 20:35:05	1.3
+++ 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.3 2002/07/22 20:35:05 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);
@@ -157,7 +157,7 @@ sub DownloadClasslist {
 
 =pod
 
-=item &DownloadStudentCourseInformation()
+=item &DownloadCourseInformation()
 
 Dump of all the course information for a single student.  There is no
 pruning of data, it is all stored in a hash and returned.  It also
@@ -181,22 +181,22 @@ database.
 
 =cut
 
-sub DownloadStudentCourseInformation {
-    my ($name,$courseID,$lastDownloadTime)=@_;
+sub DownloadCourseInformation {
+    my ($namedata,$courseID,$lastDownloadTime)=@_;
     my %courseData;
-    my ($studentName,$studentDomain) = split(/\:/,$name);
+    my ($name,$domain) = split(/\:/,$namedata);
 
-    my $modifiedTime = &GetFileTimestamp($studentDomain, $studentName,
-                                      $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 student course data
-    %courseData=&Apache::lonnet::dump($courseID, $studentDomain, $studentName);
+    # Download course data
+    %courseData=&Apache::lonnet::dump($courseID, $domain, $name);
     $courseData{'UpToDate'} = 'false';
     $courseData{'lastDownloadTime'}=time;
     return \%courseData;
@@ -449,83 +449,6 @@ sub ProcessTopResourceMap {
 
 =pod
 
-=item &ProcessSection()
-
-Determine the section number for a student for the class.  A student can have 
-multiple sections for the same class.  The correct one is chosen.
-
-=over 4
-
-Input: $sectionData, $courseid, $ActiveFlag
-
-$sectionData:  A pointer to a hash containing all section data for this 
-student for the class
-
-$courseid:  The course ID.
-
-$ActiveFlag:  The student's active status (Active/Expired)
-
-Output: $oldsection, $cursection, or -1
-
-$oldsection and $cursection and sections number that will be displayed in the 
-chart.
-
--1 is returned if an error occurs.
-
-=back
-
-
-sub ProcessSection {
-    my ($sectionData,$courseid,$ActiveFlag)=@_;
-    $courseid=~s/\_/\//g;
-    $courseid=~s/^(\w)/\/$1/;
-
-    my $cursection='-1';
-    my $oldend='-1';
-    my $status='Expired';
-    my $section='';
-    foreach my $key (keys (%$sectionData)) {
-	my $value = $sectionData->{$key};
-        if ($key=~/^$courseid(?:\/)*(\w+)*\_st$/) {
-	    $section=$1;
-	    if($key eq $courseid.'_st') {
-		$section='';
-	    }
-
-	    my ($dummy,$end,$start)=split(/\_/,$value);
-	    my $now=time;
-            my $notactive=0;
-            if ($start) {
-                if($now<$start) {
-                    $notactive=1;
-                }
-            }
-            if($end) {
-                if ($now>$end) {
-                    $notactive=1;
-                }
-            }
-            if($notactive == 0) {
-                $status='Active';
-                $cursection=$section;
-                last;
-            }
-            if($notactive == 1) {
-                if($end > $oldend) {
-                    $cursection=$section;
-                    $oldend = $end;
-                }
-            }
-	}
-    }
-
-    return ($cursections, $status);
-}
-
-=cut
-
-=pod
-
 =item &ProcessClasslist()
 
 Taking the class list dumped from &DownloadClasslist(), all the 
@@ -592,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);
@@ -648,7 +572,7 @@ sub ProcessClasslist {
 =item &ProcessStudentData()
 
 Takes the course data downloaded for a student in 
-&DownloadStudentCourseInformation() and breaks it up into key value pairs
+&DownloadCourseInformation() and breaks it up into key value pairs
 to be stored in the cached data.  The keys are comprised of the 
 $username:$domain:$keyFromCourseDatabase.  The student username:domain is
 stored away signifying that the student's information has been downloaded and 
@@ -670,7 +594,7 @@ Output: None
 *NOTE:  There is no output, but an error message is stored away in the cache 
 data.  This is checked in &FormatStudentData().  The key username:domain:error 
 will only exist if an error occured.  The error is an error from 
-&DownloadStudentCourseInformation().
+&DownloadCourseInformation().
 
 =back
 
@@ -681,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;
     }
 
@@ -694,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->{$_};
     }
@@ -701,6 +637,30 @@ sub ProcessStudentData {
     return;
 }
 
+sub LoadDiscussion {
+    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;	
+	    }
+	}
+    }       
+
+    return \%Discuss;
+}
+
 # ----- END PROCESSING FUNCTIONS ---------------------------------------
 
 =pod