--- loncom/interface/loncoursedata.pm	2002/07/22 20:35:05	1.3
+++ loncom/interface/loncoursedata.pm	2002/07/24 14:52:32	1.4
@@ -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.4 2002/07/24 14:52:32 stredwic Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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,12 +181,12 @@ 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,
+    my $modifiedTime = &GetFileTimestamp($domain, $name,
                                       $courseID.'.db', 
                                       $Apache::lonnet::perlvar{'lonUsersDir'});
     if($lastDownloadTime >= $modifiedTime) {
@@ -195,8 +195,8 @@ sub DownloadStudentCourseInformation {
         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 
@@ -648,7 +571,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 +593,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
 
@@ -701,6 +624,33 @@ sub ProcessStudentData {
     return;
 }
 
+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);
+				                            
+    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;	
+	    }
+	}
+    }       
+#   $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;
+}
+
 # ----- END PROCESSING FUNCTIONS ---------------------------------------
 
 =pod