--- loncom/lonnet/perl/lonnet.pm	2002/11/27 15:33:10	1.303
+++ loncom/lonnet/perl/lonnet.pm	2002/12/05 22:59:37	1.306
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.303 2002/11/27 15:33:10 matthew Exp $
+# $Id: lonnet.pm,v 1.306 2002/12/05 22:59:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -202,6 +202,7 @@ sub critical {
                " Critical message to unknown server ($server)</font>");
         return 'no_such_host';
     }
+    sleep 2;
     my $answer=reply($cmd,$server);
     if ($answer eq 'con_lost') {
         my $pingreply=reply('ping',$server);
@@ -215,7 +216,8 @@ sub critical {
             $middlename=substr($middlename,0,16);
             $middlename=~s/\W//g;
             my $dfilename=
-             "$perlvar{'lonSockDir'}/delayed/$now.$middlename.$server";
+      "$perlvar{'lonSockDir'}/delayed/$now.$dumpcount.$$.$middlename.$server";
+            $dumpcount++;
             {
              my $dfh;
              if ($dfh=Apache::File->new(">$dfilename")) {
@@ -840,7 +842,8 @@ sub tokenwrapper {
     if ($uri=~/^uploaded\/([^\/]+)\/([^\/]+)\/([^\/]+)(\?\.*)*$/) {
 	&appenv('userfile.'.$1.'/'.$2.'/'.$3 => $ENV{'request.course.id'});
         return 'http://'.$hostname{ &homeserver($2,$1)}.'/'.$uri.
-               (($uri=~/\?/)?'&':'?').'token='.$token;
+               (($uri=~/\?/)?'&':'?').'token='.$token.
+                               '&tokenissued='.$perlvar{'lonHostID'};
     } else {
 	return '/adm/notfound.html';
     }
@@ -2717,6 +2720,8 @@ sub courseresdata {
 	if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
 	    $courseresdatacache{$hashid.'.time'}=time;
 	    $courseresdatacache{$hashid}=\%dumpreply;
+	} elsif ($tmp =~ /^(con_lost|no_such_host)/) {
+	    return $tmp;
 	}
     }
     foreach my $item (@which) {
@@ -2846,8 +2851,9 @@ sub EXT {
 	    my %resourcedata=&get('resourcedata',
 				  [$courselevelr,$courselevelm,$courselevel],
 				 $udom,$uname);
-	    if (($resourcedata{$courselevelr}!~/^error\:/) &&
-		($resourcedata{$courselevelr}!~/^con_lost/)) {
+	    my ($tmp)=keys(%resourcedata);
+	    &Apache::lonnet::logthis("Returned $tmp: ".join(':',keys(%resourcedata)));
+	    if (($tmp!~/^error\:/) && ($tmp!~/^con_lost/)) {
 
 		if ($resourcedata{$courselevelr}) {
 		    return $resourcedata{$courselevelr}; }
@@ -2856,11 +2862,13 @@ sub EXT {
 		if ($resourcedata{$courselevel}) {
 		    return $resourcedata{$courselevel}; }
 	    } else {
-		if ($resourcedata{$courselevelr}!~/No such file/) {
+		if ($tmp!~/No such file/) {
 		    &logthis("<font color=blue>WARNING:".
 			     " Trying to get resource data for ".
 			     $uname." at ".$udom.": ".
-			     $resourcedata{$courselevelr}."</font>");
+			     $tmp."</font>");
+		} elsif ($tmp =~ /^(con_lost|no_such_host)/) {
+		  return $tmp;
 		}
 	    }