--- loncom/interface/Attic/lonspreadsheet.pm	2000/12/11 15:33:58	1.11
+++ loncom/interface/Attic/lonspreadsheet.pm	2000/12/11 18:33:24	1.13
@@ -567,6 +567,9 @@ sub parmval {
 
     my ($mapname,$id,$fn)=split(/\_\_\_/,$symb);
 # ----------------------------------------------------- Cascading lookup scheme
+       my $rwhat=$what;
+       $what=~s/^parameter\_//;
+       $what=~s/\_/\./;
 
        my $symbparm=$symb.'.'.$what;
        my $mapparm=$mapname.'___(all).'.$what;
@@ -587,6 +590,7 @@ sub parmval {
             $ENV{'request.course.id'}.'.'.$symbparm;
        my $courselevelm=
             $ENV{'request.course.id'}.'.'.$mapparm;
+
 # ---------------------------------------------------------- fourth, check user
       
       if ($uname) { 
@@ -624,7 +628,7 @@ sub parmval {
 
 # -------------------------------------------------------- first, check default
 
-       return &Apache::lonnet::metadata($fn,$what.'.default');
+       return &Apache::lonnet::metadata($fn,$rwhat.'.default');
         
 }
 
@@ -758,13 +762,15 @@ sub rowaassess {
     my $uhome=&Apache::lonnet::homeserver($uname,$udom);
     unless ($uhome eq 'no_host') { 
 # -------------------------------------------------------------- Get coursedata
-      unless ($courserdatas{$ENV{'request.course.id'}}) {
+      unless
+        ((time-$courserdatas{$ENV{'request.course.id'}.'.last_cache'})<120) {
          my $reply=&Apache::lonnet::reply('dump:'.
               $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
               $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.':resourcedata',
               $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
          if ($reply!~/^error\:/) {
             $courserdatas{$ENV{'request.course.id'}}=$reply;
+            $courserdatas{$ENV{'request.course.id'}.'.last_cache'}=time;
          }
       }
       map {
@@ -773,11 +779,13 @@ sub rowaassess {
                     &Apache::lonnet::unescape($value);  
       } split(/\&/,$courserdatas{$ENV{'request.course.id'}});
 # --------------------------------------------------- Get userdata (if present)
-      unless ($userrdatas{$uname.'___'.$udom}) {
+      unless
+        ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<120) {
          my $reply=
        &Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome);
          if ($reply!~/^error\:/) {
 	     $userrdatas{$uname.'___'.$udom}=$reply;
+	     $userrdatas{$uname.'___'.$udom.'.last_cache'}=time;
          }
       }
       map {
@@ -829,7 +837,9 @@ sub selectbox {
     return $selout.'</select>';
 }
 
-# ---------------------------------------------------------------- Main handler
+# ==================================== Sub handler to get export of assessments
+
+# ================================================================ Main handler
 
 sub handler {
     my $r=shift;