--- loncom/lonnet/perl/lonnet.pm	2002/06/27 14:08:06	1.246
+++ loncom/lonnet/perl/lonnet.pm	2002/07/04 15:47:18	1.250
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.246 2002/06/27 14:08:06 www Exp $
+# $Id: lonnet.pm,v 1.250 2002/07/04 15:47:18 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1740,8 +1740,13 @@ sub allowed {
 # Restricted by state or randomout?
 
    if ($thisallowed=~/X/) {
-      if ((&condval($statecond)) && 
-          (!$ENV{'acc.randomout'}=~/\&$ENV{'request.symb'}\&/)) {
+      if ($ENV{'acc.randomout'}) {
+         my $symb=&symbread($uri,1);
+         if (($symb) && ($ENV{'acc.randomout'}=~/\&$symb\&/)) { 
+            return ''; 
+         }
+      }
+      if (&condval($statecond)) {
 	 return '2';
       } else {
          return '';
@@ -2266,30 +2271,34 @@ sub courseresdata {
     my ($coursenum,$coursedomain,@which)=@_;
     my $coursehom=&homeserver($coursenum,$coursedomain);
     my $hashid=$coursenum.':'.$coursedomain;
-    unless (defined($courseresdatacache{$hashid.'.time'})) {
-	unless (time-$courseresdatacache{$hashid.'.time'}<300) {
-           my $coursehom=&homeserver($coursenum,$coursedomain);
-           if ($coursehom) {
-              my $dumpreply=&reply('dump:'.$coursedomain.':'.$coursenum.
-			     ':resourcedata:.',$coursehom);
-	      unless ($dumpreply=~/^error\:/) {
-	         $courseresdatacache{$hashid.'.time'}=time;
-                 $courseresdatacache{$hashid}=$dumpreply;
-	     }
-	  }
-       }
+    my $dodump=0;
+    if (!defined($courseresdatacache{$hashid.'.time'})) {
+	$dodump=1;
+    } else {
+	if (time-$courseresdatacache{$hashid.'.time'}>300) { $dodump=1; }
+    }
+    if ($dodump) {
+	my $coursehom=&homeserver($coursenum,$coursedomain);
+	if ($coursehom) {
+	    my $dumpreply=&reply('dump:'.$coursedomain.':'.$coursenum.
+				 ':resourcedata:.',$coursehom);
+	    if ($dumpreply!~/^error\:/) {
+		$courseresdatacache{$hashid.'.time'}=time;
+		$courseresdatacache{$hashid}=$dumpreply;
+	    }
+	}
+    }
+    my @pairs=split(/\&/,$courseresdatacache{$hashid});
+    my %returnhash=();
+    foreach (@pairs) {
+	my ($key,$value)=split(/=/,$_);
+	$returnhash{unescape($key)}=unescape($value);
     }
-   my @pairs=split(/\&/,$courseresdatacache{$hashid});
-   my %returnhash=();
-   foreach (@pairs) {
-      my ($key,$value)=split(/=/,$_);
-      $returnhash{unescape($key)}=unescape($value);
-   }
     my $item;
-   foreach $item (@which) {
-       if ($returnhash{$item}) { return $returnhash{$item}; }
-   }
-   return '';
+    foreach $item (@which) {
+	if ($returnhash{$item}) { return $returnhash{$item}; }
+    }
+    return '';
 }
 
 # --------------------------------------------------------- Value of a Variable
@@ -2696,7 +2705,7 @@ sub symbclean {
 # ------------------------------------------------------ Return symb list entry
 
 sub symbread {
-    my $thisfn=shift;
+    my ($thisfn,$donotrecurse)=@_;
 # no filename provided? try from environment
     unless ($thisfn) {
         if ($ENV{'request.symb'}) { return &symbclean($ENV{'request.symb'}); }
@@ -2745,7 +2754,7 @@ sub symbread {
 # ----------------------------------------------- There is only one possibility
 		     my ($mapid,$resid)=split(/\./,$ids);
                      $syval=declutter($bighash{'map_id_'.$mapid}).'___'.$resid;
-                 } else {
+                 } elsif (!$donotrecurse) {
 # ------------------------------------------ There is more than one possibility
                      my $realpossible=0;
                      foreach (@possibilities) {
@@ -2760,6 +2769,8 @@ sub symbread {
 			 }
                      }
 		     if ($realpossible!=1) { $syval=''; }
+                 } else {
+                     $syval='';
                  }
 	      }
               untie(%bighash)