--- loncom/interface/Attic/lonspreadsheet.pm	2000/12/11 22:25:35	1.14
+++ loncom/interface/Attic/lonspreadsheet.pm	2000/12/12 16:48:21	1.15
@@ -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 Gerd Kortemeyer
 
 package Apache::lonspreadsheet;
 
@@ -758,7 +759,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 +811,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 +824,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};
 	       }
 	   }
         }