--- loncom/interface/Attic/lonspreadsheet.pm	2000/12/11 22:25:35	1.14
+++ loncom/interface/Attic/lonspreadsheet.pm	2000/12/16 21:34:47	1.16
@@ -1,7 +1,8 @@
 # The LearningOnline Network with CAPA
 # Spreadsheet/Grades Display Handler
 #
-# 11/11,11/15,11/27,12/04,12/05,12/06,12/07,12/08,12/09,12/11 Gerd Kortemeyer
+# 11/11,11/15,11/27,12/04,12/05,12/06,12/07,
+# 12/08,12/09,12/11,12/12,12/15,12/16 Gerd Kortemeyer
 
 package Apache::lonspreadsheet;
 
@@ -259,9 +260,15 @@ sub SUMMIN {
 
 sub sett {
     %t=();
+    my $pattern='';
+    if ($sheettype eq 'assesscalc') {
+	$pattern='A';
+    } else {
+        $pattern='[A-Z]';
+    }
     map {
 	if ($f{$_}) {
-            if ($_=~/^A/) {
+            if ($_=~/^$pattern/) {
 	        unless ($f{$_}=~/^\!/) {
 		    $t{$_}=$c{$_};
                 }
@@ -299,7 +306,7 @@ sub calc {
     return '';
 }
 
-sub outrow {
+sub outrowassess {
     my $n=shift;
     my @cols=();
     if ($n) {
@@ -435,6 +442,12 @@ sub rown {
     my $defaultbg=((($n-1)/5)==int(($n-1)/5))?'#E0E0':'#FFFF';
     my $rowdata="\n<tr><td><b><font size=+1>$n</font></b></td>";
     my $showf=0;
+    my $proc;
+    if (&gettype($safeeval) eq 'assesscalc') {
+        $proc='&outrowassess';
+    } else {
+        $proc='&outrow';
+    }
     map {
        my $bgcolor=$defaultbg.((($showf-1)/5==int(($showf-1)/5))?'99':'DD');
        my ($fm,$vl)=split(/\_\_\_eq\_\_\_/,$_);
@@ -452,7 +465,7 @@ sub rown {
            $rowdata.='<td bgcolor='.$bgcolor.'>&nbsp;'.$vl.'&nbsp;</td>';
        }
        $showf++;
-    } $safeeval->reval('&outrow('.$n.')');
+    } $safeeval->reval($proc.'('.$n.')');
     return $rowdata.'</tr>';
 }
 
@@ -748,6 +761,28 @@ sub updaterows {
     }
 }
 
+# --------------------------------------------------- Load data for one student
+
+sub rowazstudent {
+    my $safeeval=shift;
+    my %c=();
+    my %f=&getformulas($safeeval);
+    map {
+	if ($_=~/^A/) {
+           unless ($f{$_}=~/^\!/) {
+              print &Apache::lonnet::ssi(
+        '/res/msu/korte/junk.assesscalc',('utarget' => 'export',
+                                          'uname'   => $uname,
+                                          'udom'    => $udom,
+			                  'usymb'   => $f{$_})).
+              '<br>'.$f{$_}.'<br>';
+	   }
+        }
+    } keys %f;
+
+    &setconstants($safeeval,%c);
+}
+
 # ------------------------------------------------ Load data for one assessment
 
 sub rowaassess {
@@ -758,7 +793,9 @@ sub rowaassess {
 
 # ----------------------------------------------------------- Get stored values
     my $answer=&Apache::lonnet::reply(
-       "restore:$udom:$uname:$namespace:$symb",$uhome);
+       "restore:$udom:$uname:".
+       &Apache::lonnet::escape($namespace).":".
+       &Apache::lonnet::escape($symb),$uhome);
     my %returnhash=();
     map {
 	my ($name,$value)=split(/\=/,$_);
@@ -808,7 +845,7 @@ sub rowaassess {
       map {
          my ($name,$value)=split(/\=/,$_);
          $useropt{&Apache::lonnet::unescape($name)}=
-                  &Apache::lonnet::unescape($value);
+	          &Apache::lonnet::unescape($value);
       } split(/\&/,$userrdatas{$uname.'___'.$udom});
    }
 # -- now courseopt, useropt initialized for this user and course (used parmval)
@@ -821,7 +858,10 @@ sub rowaassess {
   	       if ($f{$_}=~/^parameter/) {
 	          $c{$_}=&parmval($f{$_},$symb);
 	       } else {
- 	          $c{$_}=$returnhash{$f{$_}};
+		  my $key=$f{$_};
+                  $key=~s/^stores\_/resource\./;
+                  $key=~s/\_/\./;
+ 	          $c{$_}=$returnhash{$key};
 	       }
 	   }
         }
@@ -897,7 +937,7 @@ sub handler {
     }
 # ----------------------------------------------------------- Change of target?
 
-    my $reroute=($ENV{'utarget'} eq 'export');
+    my $reroute=($ENV{'form.utarget'} eq 'export');
 
 # ------------------------------------------------------------------- Open page
 
@@ -985,6 +1025,8 @@ ENDSCRIPT
 
     if (&gettype($sheetone) eq 'assesscalc') {
 	&rowaassess($sheetone,$ENV{'form.usymb'});
+    } elsif  (&gettype($sheetone) eq 'studentcalc') {
+	&rowazstudent($sheetone);
     }
     &calcsheet($sheetone);