--- loncom/interface/Attic/lonspreadsheet.pm	2001/03/20 20:11:27	1.47
+++ loncom/interface/Attic/lonspreadsheet.pm	2001/03/20 21:49:05	1.49
@@ -1504,7 +1504,9 @@ sub forcedrecalc {
         if (&checkthis('::assesscalc:',$time) ||
             &checkthis('::assesscalc:'.$map,$time) ||
             &checkthis('::assesscalc:'.$usymb,$time) ||
-            &checkthis($uname.':'.$udom.':assesscalc:',$time)) {
+            &checkthis($uname.':'.$udom.':assesscalc:',$time) ||
+            &checkthis($uname.':'.$udom.':assesscalc:'.$map,$time) ||
+            &checkthis($uname.':'.$udom.':assesscalc:'.$usymb,$time)) {
             return 1;
         } 
     } else {
@@ -1637,6 +1639,27 @@ sub exportsheet {
  }
  return @exportarr;
 }
+# ============================================================ Expiration Dates
+#
+# Load previously cached student spreadsheets for this course
+#
+
+sub expirationdates {
+    undef %expiredates;
+    my $cid=$ENV{'request.course.id'};
+    my $reply=&Apache::lonnet::reply('dump:'.
+				     $ENV{'course.'.$cid.'.domain'}.':'.
+                                     $ENV{'course.'.$cid.'.num'}.
+				     ':nohist_expirationdates',
+                                     $ENV{'course.'.$cid.'.home'});
+    unless ($reply=~/^error\:/) {
+	map {
+            my ($name,$value)=split(/\=/,$_);
+            $expiredates{&Apache::lonnet::unescape($name)}
+                        =&Apache::lonnet::unescape($value);
+        } split(/\&/,$reply);
+    }
+}
 
 # ===================================================== Calculated sheets cache
 #
@@ -1858,6 +1881,8 @@ ENDSCRIPT
 
 # --------------------------------------------------------------- Cached sheets
 
+    &expirationdates();
+
     undef %oldsheets;
     undef %loadedcaches;