--- loncom/interface/Attic/lonspreadsheet.pm	2001/10/16 20:50:28	1.68
+++ 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,9/14,9/17,10/16 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;
             
@@ -1567,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};
 	       }
@@ -2143,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);