--- loncom/interface/Attic/lonspreadsheet.pm	2001/09/12 21:07:20	1.62
+++ loncom/interface/Attic/lonspreadsheet.pm	2001/10/16 20:50:28	1.68
@@ -6,7 +6,7 @@
 # 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 Gerd Kortemeyer
+# 07/09,07/14,07/21,09/01,09/10,9/11,9/12,9/13,9/14,9/17,10/16 Gerd Kortemeyer
 
 package Apache::lonspreadsheet;
             
@@ -676,24 +676,6 @@ sub rown {
     } else {
        $defaultbg='#E0FF';
     }
-    my $headerrow='';
-    if ((($n-1)/25)==int(($n-1)/25)) {
-        my $what='Student';
-        if (&gettype($safeeval) eq 'assesscalc') {
-	    $what='Item';
-	} elsif (&gettype($safeeval) eq 'studentcalc') {
-            $what='Assessment';
-        }
-	$headerrow.="</table>\n<br><table border=2>".
-        '<tr><td>&nbsp;<td>'.$what.'</td>';
-        map {
-           $headerrow.='<td>'.$_.'</td>';
-        } ('A','B','C','D','E','F','G','H','I','J','K','L','M',
-           'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
-           'a','b','c','d','e','f','g','h','i','j','k','l','m',
-           'n','o','p','q','r','s','t','u','v','w','x','y','z');
-        $headerrow.='</tr>';
-    }
     $rowdata.="\n<tr><td><b><font size=+1>$n</font></b></td>";
     my $showf=0;
     my $proc;
@@ -732,9 +714,9 @@ sub rown {
        $showf++;
     } $safeeval->reval($proc.'('.$n.')');
     if ($ENV{'form.showall'} || ($dataflag)) {
-       return $headerrow.$rowdata.'</tr>';
+       return $rowdata.'</tr>';
     } else {
-       return $headerrow;
+       return '';
     }
 }
 
@@ -778,10 +760,43 @@ sub outsheet {
     $tabledata.='</tr>';
     my $row;
     my $maxrow=&getmaxrow($safeeval);
-    $tabledata.=&rown($safeeval,'-');
+    $tabledata.=&rown($safeeval,'-').&rown($safeeval,0);
     $r->print($tabledata);
-    for ($row=0;$row<=$maxrow;$row++) {
-        $r->print(&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;
+    }
+    @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';
+        }
+
+    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',
+           'N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
+           'a','b','c','d','e','f','g','h','i','j','k','l','m',
+           'n','o','p','q','r','s','t','u','v','w','x','y','z');
+        $r->print('</tr>');
+       }
+       $n++;
+       $r->print($thisrow);
+      }
     }
     $r->print('</table>');
 }
@@ -1034,7 +1049,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;