--- loncom/interface/Attic/lonspreadsheet.pm	2001/09/13 15:55:40	1.63
+++ loncom/interface/Attic/lonspreadsheet.pm	2001/10/17 18:35:17	1.69
@@ -6,7 +6,8 @@
 # 01/01/01,02/01,03/01,19/01,20/01,22/01,
 # 03/05,03/08,03/10,03/12,03/13,03/15,03/17,
 # 03/19,03/20,03/21,03/27,04/05,04/09,
-# 07/09,07/14,07/21,09/01,09/10,9/11,9/12,9/13 Gerd Kortemeyer
+# 07/09,07/14,07/21,09/01,09/10,9/11,9/12,9/13,9/14,9/17,
+# 10/16,10/17 Gerd Kortemeyer
 
 package Apache::lonspreadsheet;
             
@@ -760,24 +761,32 @@ sub outsheet {
     $tabledata.='</tr>';
     my $row;
     my $maxrow=&getmaxrow($safeeval);
-    $tabledata.=&rown($safeeval,'-');
+    $tabledata.=&rown($safeeval,'-').&rown($safeeval,0);
     $r->print($tabledata);
-    my @rowprt=();
-    for ($row=0;$row<=$maxrow;$row++) {
-        $rowprt[$row]=&rown($safeeval,$row);
+
+    my @sortby=();
+    my @sortidx=();
+    for ($row=1;$row<=$maxrow;$row++) {
+       $sortby[$row-1]=$safeeval->reval('$f{"A'.$row.'"}');
+       $sortidx[$row-1]=$row-1;
     }
-    my $n=0;
-    for ($row=0;$row<=$maxrow;$row++) {
-     if ($rowprt[$row]) {
-      if ((($n-1)/25)==int(($n-1)/25)) {
+    @sortidx=sort { $sortby[$a] cmp $sortby[$b]; } @sortidx;
+
         my $what='Student';
         if (&gettype($safeeval) eq 'assesscalc') {
 	    $what='Item';
 	} elsif (&gettype($safeeval) eq 'studentcalc') {
             $what='Assessment';
         }
-	$r->print("</table>\n<br><table border=2>".
-        '<tr><td>&nbsp;<td>'.$what.'</td>');
+
+    my $n=0;
+    for ($row=0;$row<$maxrow;$row++) {
+     my $thisrow=&rown($safeeval,$sortidx[$row]+1);
+     if ($thisrow) {
+       if ($n/25==int($n/25)) {
+	$r->print("</table>\n<br>\n");
+        $r->rflush();
+        $r->print('<table border=2><tr><td>&nbsp;<td>'.$what.'</td>');
         map {
            $r->print('<td>'.$_.'</td>');
         } ('A','B','C','D','E','F','G','H','I','J','K','L','M',
@@ -786,12 +795,11 @@ sub outsheet {
            'n','o','p','q','r','s','t','u','v','w','x','y','z');
         $r->print('</tr>');
        }
-         $n++;
-         $r->print($rowprt[$row]);
+       $n++;
+       $r->print($thisrow);
       }
     }
     $r->print('</table>');
-    undef @rowprt;
 }
 
 #
@@ -1042,7 +1050,7 @@ sub parmval {
 # ----------------------------------------------------- Cascading lookup scheme
        my $rwhat=$what;
        $what=~s/^parameter\_//;
-       $what=~s/\_/\./;
+       $what=~s/\_([^\_]+)$/\.$1/;
 
        my $symbparm=$symb.'.'.$what;
        my $mapparm=$mapname.'___(all).'.$what;
@@ -1560,7 +1568,7 @@ sub loadassessment {
 		  my $key=$f{$_};
                   my $ckey=$key;
                   $key=~s/^stores\_/resource\./;
-                  $key=~s/\_/\./;
+                  $key=~s/\_([^\_]+)$/\.$1/;
  	          $c{$_}=$returnhash{$key};
                   $c{$ckey}=$returnhash{$key};
 	       }
@@ -2136,7 +2144,12 @@ ENDSCRIPT
     $r->print('<input type=checkbox name=showall onClick="submit()"');
     if ($ENV{'form.showall'}) { $r->print(' checked'); }
     $r->print('>');
-
+    if (&gettype($asheet) eq 'classcalc') {
+       $r->print(
+   ' Output CSV format: <input type=checkbox name=showcsv onClick="submit()"');
+       if ($ENV{'form.showcsv'}) { $r->print(' checked'); }
+       $r->print('>');
+    }
 # ------------------------------------------------------------- Print out sheet
 
     &outsheet($r,$asheet);