--- loncom/interface/loncoursedata.pm	2002/09/03 02:22:40	1.29
+++ loncom/interface/loncoursedata.pm	2002/10/09 17:25:23	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # (Publication Handler
 #
-# $Id: loncoursedata.pm,v 1.29 2002/09/03 02:22:40 albertel Exp $
+# $Id: loncoursedata.pm,v 1.34 2002/10/09 17:25:23 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -139,7 +139,7 @@ sub DownloadClasslist {
     %classlist=&Apache::lonnet::dump('classlist',$courseDomain, $courseNumber);
     foreach(keys (%classlist)) {
         if(/^(con_lost|error|no_such_host)/i) {
-            return \%classlist;
+	    return;
         }
     }
 
@@ -322,7 +322,8 @@ sub ProcessTopResourceMap {
     my (@sequences, @currentResource, @finishResource);
     my ($currentSequence, $currentResourceID, $lastResourceID);
 
-    $currentResourceID=$hash{'ids_/res/'.$ENV{'request.course.uri'}};
+    $currentResourceID=$hash{'ids_'.
+      &Apache::lonnet::clutter($ENV{'request.course.uri'})};
     push(@currentResource, $currentResourceID);
     $lastResourceID=-1;
     $currentSequence=-1;
@@ -585,7 +586,24 @@ browser
 Output: @names
 
 @names:  An array of students whose information has been processed, and are to 
-be considered in an arbitrary order.
+be considered in an arbitrary order.  The entries in @names are of the form
+username:domain.
+
+The values in $cache are as follows:
+
+ *NOTE: for the following $name implies username:domain
+ $name.':error'                  only defined if an error occured.  Value
+                                 contains the error message
+ $name.':lastDownloadTime'       unconverted time of the last update of a
+                                 student\'s course data
+ $name.'updateTime'              coverted time of the last update of a 
+                                 student\'s course data
+ $name.':username'               username of a student
+ $name.':domain'                 domain of a student
+ $name.':fullname'               full name of a student
+ $name.':id'                     PID of a student
+ $name.':Status'                 active/expired status of a student
+ $name.':section'                section of a student
 
 =back
 
@@ -608,9 +626,8 @@ sub ProcessClasslist {
         if($c->aborted()) {
             return ();
         }
-        my $studentInformation = $classlist->{$name.':studentInformation'},
-        my $sectionData = $classlist->{$name.':sections'},
-        my $date = $classlist->{$name},
+        my $studentInformation = $classlist->{$name.':studentInformation'};
+        my $date = $classlist->{$name};
         my ($studentName,$studentDomain) = split(/\:/,$name);
 
         $cache->{$name.':username'}=$studentName;
@@ -645,6 +662,7 @@ sub ProcessClasslist {
         $courseID=~s/^(\w)/\/$1/;
 
         my $sec='';
+        my $sectionData = $classlist->{$name.':sections'};
         foreach my $key (keys (%$sectionData)) {
             my $value = $sectionData->{$key};
             if ($key=~/^$courseID(?:\/)*(\w+)*\_st$/) {
@@ -652,7 +670,7 @@ sub ProcessClasslist {
                 if($key eq $courseID.'_st') {
                     $tempsection='';
                 }
-                my ($dummy,$roleend,$rolestart)=split(/\_/,$value);
+                my (undef,$roleend,$rolestart)=split(/\_/,$value);
                 if($roleend eq $end && $rolestart eq $start) {
                     $sec = $tempsection;
                     last;
@@ -1066,37 +1084,22 @@ sub ProcessFullName {
     my ($lastname, $generation, $firstname, $middlename)=@_;
     my $Str = '';
 
+    # Strip whitespace preceeding & following name components.
+    $lastname   =~ s/(\s+$|^\s+)//g;
+    $generation =~ s/(\s+$|^\s+)//g;
+    $firstname  =~ s/(\s+$|^\s+)//g;
+    $middlename =~ s/(\s+$|^\s+)//g;
+
     if($lastname ne '') {
-	$Str .= $lastname.' ';
-	if($generation ne '') {
-	    $Str .= $generation;
-	} else {
-	    chop($Str);
-	}
-	$Str .= ', ';
-	if($firstname ne '') {
-	    $Str .= $firstname.' ';
-	}
-	if($middlename ne '') {
-	    $Str .= $middlename;
-	} else {
-	    chop($Str);
-	    if($firstname eq '') {
-		chop($Str);
-	    }
-	}
+	$Str .= $lastname;
+	$Str .= ' '.$generation if ($generation ne '');
+	$Str .= ',';
+        $Str .= ' '.$firstname  if ($firstname ne '');
+        $Str .= ' '.$middlename if ($middlename ne '');
     } else {
-	if($firstname ne '') {
-	    $Str .= $firstname.' ';
-	}
-	if($middlename ne '') {
-	    $Str .= $middlename.' ';
-	}
-	if($generation ne '') {
-	    $Str .= $generation;
-	} else {
-	    chop($Str);
-	}
+        $Str .= $firstname      if ($firstname ne '');
+        $Str .= ' '.$middlename if ($middlename ne '');
+        $Str .= ' '.$generation if ($generation ne '');
     }
 
     return $Str;
@@ -1250,7 +1253,7 @@ sub DownloadStudentCourseDataSeparate {
     $WhatIWant .= '|timestamp)';
     $WhatIWant .= ')';
 
-    &CheckForResidualDownload($courseID, $cacheDB, $students, $c);
+    &CheckForResidualDownload($cacheDB, 'true', 'true', $courseID, $r, $c);
 
     my $studentCount = scalar(@$students);
     if($status eq 'true') {