--- loncom/lonnet/perl/lonnet.pm	2003/07/06 10:30:21	1.388
+++ loncom/lonnet/perl/lonnet.pm	2003/07/16 20:13:17	1.391
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.388 2003/07/06 10:30:21 www Exp $
+# $Id: lonnet.pm,v 1.391 2003/07/16 20:13:17 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1425,19 +1425,19 @@ sub devalidate {
     my ($symb,$uname,$udom)=@_;
     my $cid=$ENV{'request.course.id'}; 
     if ($cid) {
-# delete the stored spreadsheets for
-# - the student level sheet of this user in course's homespace
-# - the assessment level sheet for this resource 
-#   for this user in user's homespace
+        # delete the stored spreadsheets for
+        # - the student level sheet of this user in course's homespace
+        # - the assessment level sheet for this resource 
+        #   for this user in user's homespace
 	my $key=$uname.':'.$udom.':';
         my $status=
 	    &del('nohist_calculatedsheets',
-		 [$key.'studentcalc'],
+		 [$key.'studentcalc:'],
 		 $ENV{'course.'.$cid.'.domain'},
 		 $ENV{'course.'.$cid.'.num'})
 		.' '.
 	    &del('nohist_calculatedsheets_'.$cid,
-		 [$key.'assesscalc:'.$symb]);
+		 [$key.'assesscalc:'.$symb],$udom,$uname);
         unless ($status eq 'ok ok') {
            &logthis('Could not devalidate spreadsheet '.
                     $uname.' at '.$udom.' for '.
@@ -3204,7 +3204,7 @@ sub clear_EXT_cache_status {
 sub EXT_cache_status {
     my ($target_domain,$target_user) = @_;
     my $cachename = 'cache.EXT.'.$target_user.'.'.$target_domain;
-    if (exists($ENV{$cachename}) && ($ENV{$cachename}+1800) > time) {
+    if (exists($ENV{$cachename}) && ($ENV{$cachename}+600) > time) {
         # We know already the user has no data
         return 1;
     } else {
@@ -4100,7 +4100,8 @@ BEGIN {
     %domain_auth_arg_def = ();
     if ($fh) {
        while (<$fh>) {
-           next if /^\#/;
+           next if (/^(\#|\s*$)/);
+#           next if /^\#/;
            chomp;
            my ($domain, $domain_description, $def_auth, $def_auth_arg)
                = split(/:/,$_,4);