--- loncom/lonnet/perl/lonnet.pm	2000/10/06 21:00:05	1.37
+++ loncom/lonnet/perl/lonnet.pm	2000/10/09 20:26:17	1.40
@@ -28,7 +28,7 @@
 # restore            : returns hash for this url
 # eget(namesp,array) : returns hash with keys from array filled in from namesp
 # get(namesp,array)  : returns hash with keys from array filled in from namesp
-# del(namesp,array)  : deletes keys out of arry from namesp
+# del(namesp,array)  : deletes keys out of array from namesp
 # put(namesp,hash)   : stores hash in namesp
 # dump(namesp)       : dumps the complete namespace into a hash
 # ssi(url,hash)      : does a complete request cycle on url to localhost, posts
@@ -36,10 +36,13 @@
 # coursedescription(id) : returns and caches course description for id
 # repcopy(filename)  : replicate file
 # dirlist(url)       : gets a directory listing
+# directcondval(index) : reading condition value of single condition from 
+#                        state string
 # condval(index)     : value of condition index based on state
 # varval(name)       : value of a variable
 # refreshstate()     : refresh the state information string
 # symblist(map,hash) : Updates symbolic storage links
+# symbread(filename) : returns the data handle
 # rndseed()          : returns a random seed  
 # getfile(filename)  : returns the contents of filename, or a -1 if it can't
 #                      be found, replicates and subscribes to the file
@@ -59,7 +62,7 @@
 # 08/22,08/28,08/31,09/01,09/02,09/04,09/05,09/25,09/28,09/30 Gerd Kortemeyer
 # 10/04 Gerd Kortemeyer
 # 10/04 Guy Albertelli
-# 10/06 Gerd Kortemeyer
+# 10/06,10/09 Gerd Kortemeyer
 
 package Apache::lonnet;
 
@@ -487,7 +490,7 @@ sub coursedescription {
            } split(/\&/,$rep);
            $returnhash{'url'}='/res/'.declutter($returnhash{'url'});
            $returnhash{'fn'}=$perlvar{'lonDaemons'}.'/tmp/'.
-	       $ENV{'user.name.'}.'_'.$cdomain.'_'.$cnum;
+	       $ENV{'user.name'}.'_'.$cdomain.'_'.$cnum;
 	   put ('coursedescriptions',%cachehash);
            return %returnhash;
        }
@@ -939,6 +942,15 @@ sub dirlist {
 
 # -------------------------------------------------------- Value of a Condition
 
+sub directcondval {
+    my $number=shift;
+    if ($ENV{'user.state.'.$ENV{'request.course.id'}}) {
+       return substr($ENV{'user.state.'.$ENV{'request.course.id'}},$number,1);
+    } else {
+       return 2;
+    }
+}
+
 sub condval {
     my $condidx=shift;
     my $result=0;
@@ -959,8 +971,7 @@ sub condval {
               } elsif (($_ eq '&') || ($_ eq '|')) {
                   $operand=$_;
               } else {
-                  my $new=
-                    substr($ENV{'user.state.'.$ENV{'request.course.id'}},$_,1);
+                  my $new=directcondval($_);
                   if ($operand eq '&') {
                      $result=$result>$new?$new:$result;
                   } else {
@@ -1043,17 +1054,31 @@ sub symbread {
               if ($ids) {
 # ------------------------------------------------------------------- Has ID(s)
                  my @possibilities=split(/\,/,$ids);
-                 if ($#possibilities==1) {
+                 if ($#possibilities==0) {
+# ----------------------------------------------- There is only one possibility
 		     my ($mapid,$resid)=split(/\./,$ids);
                      $syval=declutter($bighash{'map_id_'.$mapid}).'___'.$resid;
                  } else {
-                     $syval='';
+# ------------------------------------------ There is more than one possibility
+                     my $realpossible=0;
+                     map {
+			 my $file=$bighash{'src_'.$_};
+                         if (&allowed('bre',$file)) {
+         		    my ($mapid,$resid)=split(/\./,$_);
+                            if ($bighash{'map_type_'.$mapid} ne 'page') {
+				$realpossible++;
+                                $syval=declutter($bighash{'map_id_'.$mapid}).
+                                       '___'.$resid;
+                            }
+			 }
+                     } @possibilities;
+		     if ($realpossible!=1) { $syval=''; }
                  }
 	      }
               untie(%bighash)
            } 
         }
-        return $syval.'___'.$thisfn;
+        if ($syval) { return $syval.'___'.$thisfn; }
     }
     return '';
 }