--- loncom/interface/Attic/lonspreadsheet.pm	2001/01/02 22:58:46	1.31
+++ loncom/interface/Attic/lonspreadsheet.pm	2001/01/03 14:27:30	1.33
@@ -3,7 +3,7 @@
 #
 # 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,12/18,12/19,12/30,
-# 01/01/01,02/01 Gerd Kortemeyer
+# 01/01/01,02/01,03/01 Gerd Kortemeyer
 
 package Apache::lonspreadsheet;
 
@@ -20,7 +20,11 @@ use HTML::TokeParser;
 # These cache hashes need to be independent of user, resource and course
 # (user and course can/should be in the keys)
 #
-use vars qw(%spreadsheets %courserdatas %userrdatas %defaultsheets);
+
+my %spreadsheets;
+my %courserdatas;
+my %userrdatas;
+my %defaultsheets;
 
 #
 # These global hashes are dependent on user, course and resource, 
@@ -1191,12 +1195,13 @@ sub loadcourse {
 	   my $row=$1;
            unless (($f{$_}=~/^\!/)
 
-|| ($row>25))
+|| ($row>200))
 
  {
 	      my @studentdata=&exportsheet(&getuname($safeeval),
                                            &getudom($safeeval),
                                            'studentcalc');
+              undef %userrdatas; 
               my $index=0;
               map {
                   if ($studentdata[$index]) {
@@ -1260,7 +1265,7 @@ sub loadassessment {
     unless ($uhome eq 'no_host') { 
 # -------------------------------------------------------------- Get coursedata
       unless
-        ((time-$courserdatas{$cid.'.last_cache'})<120) {
+        ((time-$courserdatas{$cid.'.last_cache'})<240) {
          my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.
               ':resourcedata',$chome);
          if ($reply!~/^error\:/) {
@@ -1275,7 +1280,7 @@ sub loadassessment {
       } split(/\&/,$courserdatas{$ENV{'request.course.id'}});
 # --------------------------------------------------- Get userdata (if present)
       unless
-        ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<120) {
+        ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<240) {
          my $reply=
        &Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome);
          if ($reply!~/^error\:/) {
@@ -1571,6 +1576,9 @@ ENDSCRIPT
     &outsheet($r,$asheet);
     $r->print('</form></body></html>');
 
+# --------------------------------- We know this leaks, so terminate this child
+
+    $r->child_terminate();
 
 # ------------------------------------------------------------------------ Done
   } else {