--- loncom/interface/Attic/lonspreadsheet.pm	2001/10/17 22:09:53	1.71
+++ loncom/interface/Attic/lonspreadsheet.pm	2001/11/05 18:22:24	1.73
@@ -7,7 +7,7 @@
 # 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,10/17 Gerd Kortemeyer
+# 10/16,10/17,10/20,11/05 Gerd Kortemeyer
 
 package Apache::lonspreadsheet;
             
@@ -880,10 +880,13 @@ sub readsheet {
 	my $sheetxml='';
        {
          my $fh;
-         if ($fh=Apache::File->new($includedir.
-                         '/default.'.&gettype($safeeval))) {
+         my $dfn=$fn;
+         $dfn=~s/\_/\./g;
+         if ($fh=Apache::File->new($includedir.'/'.$dfn)) {
                $sheetxml=join('',<$fh>);
-          }
+	 } else {
+             $sheetxml='<field row="0" col="A">"Error"</field>';
+	 }
        }
         my $parser=HTML::TokeParser->new(\$sheetxml);
         my $token;
@@ -1243,7 +1246,6 @@ sub updatestudentassesssheet {
 
 	my %allkeys=('timestamp' => 
                      'Timestamp of Last Transaction<br>timestamp');
-        my %allassess=();
 
         my $adduserstr='';
         if ((&getuname($safeeval) ne $ENV{'user.name'}) ||
@@ -1252,6 +1254,17 @@ sub updatestudentassesssheet {
 		'&udom='.&getudom($safeeval);
         }
 
+        my %allassess=('_feedback' =>
+	              '<a href="/adm/assesscalc?usymb=_feedback'.$adduserstr.
+                       '">Feedback</a>',
+                       '_evaluation' =>
+	              '<a href="/adm/assesscalc?usymb=_evaluation'.$adduserstr.
+                       '">Evaluation</a>',
+                       '_tutoring' =>
+	              '<a href="/adm/assesscalc?usymb=_tutoring'.$adduserstr.
+                       '">Tutoring</a>'
+        );
+
         map {
 	    if ($_=~/^src\_(\d+)\.(\d+)$/) {
 	       my $mapid=$1;
@@ -1927,6 +1940,10 @@ $tmpdir=$r->dir_config('lonDaemons').'/t
        }
     } (split(/&/,$ENV{'QUERY_STRING'}));
 
+    if (($ENV{'form.usymb'}=~/^\_(\w+)/) && (!$ENV{'form.ufn'})) {
+	$ENV{'form.ufn'}='default_'.$1;
+    }
+
 # -------------------------------------- Interactive loading of specific sheet?
     if (($ENV{'form.load'}) && ($ENV{'form.loadthissheet'} ne 'Default')) {
 	$ENV{'form.ufn'}=$ENV{'form.loadthissheet'};