--- loncom/lonnet/perl/lonnet.pm	2000/10/06 21:00:05	1.37
+++ loncom/lonnet/perl/lonnet.pm	2000/10/20 10:57:46	1.47
@@ -25,26 +25,33 @@
 # revokecustomrole (udom,uname,url,rdom,rnam,rolename) : Revoke a custom role
 # appenv(hash)       : adds hash to session environment
 # store(hash)        : stores hash permanently for this url
+# cstore(hash)       : critical store
 # 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
+# cput(namesp,hash)  : critical put
 # dump(namesp)       : dumps the complete namespace into a hash
 # ssi(url,hash)      : does a complete request cycle on url to localhost, posts
 #                      hash
 # 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 (filename optional)
 # 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
 # filelocation(dir,file) : returns a farily clean absolute reference to file 
 #                          from the directory dir
+# hreflocation(dir,file) : same as filelocation, but for hrefs
+# log(domain,user,home,msg) : write to permanent log for user
 #
 # 6/1/99,6/2,6/10,6/11,6/12,6/14,6/26,6/28,6/29,6/30,
 # 7/1,7/2,7/9,7/10,7/12,7/14,7/15,7/19,
@@ -59,7 +66,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,10/10,10/11,10/14,10/20 Gerd Kortemeyer
 
 package Apache::lonnet;
 
@@ -420,7 +427,7 @@ sub ssi {
 
 sub log {
     my ($dom,$nam,$hom,$what)=@_;
-    return reply("log:$dom:$nam:$what",$hom);
+    return critical("log:$dom:$nam:$what",$hom);
 }
 
 # ----------------------------------------------------------------------- Store
@@ -428,7 +435,7 @@ sub log {
 sub store {
     my %storehash=@_;
     my $symb;
-    unless ($symb=escape(&symbread($ENV{'request.filename'}))) { return ''; }
+    unless ($symb=escape(&symbread())) { return ''; }
     my $namespace;
     unless ($namespace=$ENV{'request.course.id'}) { return ''; }
     my $namevalue='';
@@ -441,11 +448,29 @@ sub store {
 		 "$ENV{'user.home'}");
 }
 
+# -------------------------------------------------------------- Critical Store
+
+sub cstore {
+    my %storehash=@_;
+    my $symb;
+    unless ($symb=escape(&symbread())) { return ''; }
+    my $namespace;
+    unless ($namespace=$ENV{'request.course.id'}) { return ''; }
+    my $namevalue='';
+    map {
+        $namevalue.=escape($_).'='.escape($storehash{$_}).'&';
+    } keys %storehash;
+    $namevalue=~s/\&$//;
+    return critical(
+     "store:$ENV{'user.domain'}:$ENV{'user.name'}:$namespace:$symb:$namevalue",
+		 "$ENV{'user.home'}");
+}
+
 # --------------------------------------------------------------------- Restore
 
 sub restore {
     my $symb;
-    unless ($symb=escape(&symbread($ENV{'request.filename'}))) { return ''; }
+    unless ($symb=escape(&symbread())) { return ''; }
     my $namespace;
     unless ($namespace=$ENV{'request.course.id'}) { return ''; }
     my $answer=reply(
@@ -487,7 +512,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;
        }
@@ -593,10 +618,11 @@ sub get {
                  $ENV{'user.home'});
    my @pairs=split(/\&/,$rep);
    my %returnhash=();
+   my $i=0;
    map {
-      my ($key,$value)=split(/=/,$_);
-      $returnhash{unescape($key)}=unescape($value);
-   } @pairs;
+      $returnhash{$_}=unescape($pairs[$i]);
+      $i++;
+   } @storearr;
    return %returnhash;
 }
 
@@ -641,6 +667,20 @@ sub put {
                  $ENV{'user.home'});
 }
 
+# ------------------------------------------------------ critical put interface
+
+sub cput {
+   my ($namespace,%storehash)=@_;
+   my $items='';
+   map {
+       $items.=escape($_).'='.escape($storehash{$_}).'&';
+   } keys %storehash;
+   $items=~s/\&$//;
+   return critical
+           ("put:$ENV{'user.domain'}:$ENV{'user.name'}:$namespace:$items",
+                 $ENV{'user.home'});
+}
+
 # -------------------------------------------------------------- eget interface
 
 sub eget {
@@ -654,10 +694,11 @@ sub eget {
                  $ENV{'user.home'});
    my @pairs=split(/\&/,$rep);
    my %returnhash=();
+   my $i=0;
    map {
-      my ($key,$value)=split(/=/,$_);
-      $returnhash{unescape($key)}=unescape($value);
-   } @pairs;
+      $returnhash{$_}=unescape($pairs[$i]);
+      $i++;
+   } @storearr;
    return %returnhash;
 }
 
@@ -756,7 +797,7 @@ sub allowed {
 # Restricted by state?
 
            if ($thisallowed=~/X/) {
-	      if (&condval($uricond)>1) {
+	      if (&condval($uricond)) {
 	         return '2';
               } else {
                  return '';
@@ -939,6 +980,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 +1009,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 {
@@ -1016,11 +1065,15 @@ sub symblist {
 # ------------------------------------------------------ Return symb list entry
 
 sub symbread {
-    my $thisfn=declutter(shift);
+    my $thisfn=shift;
+    unless ($thisfn) {
+	$thisfn=$ENV{'request.filename'};
+    }
+    $thisfn=declutter($thisfn);
     my %hash;
     my %bighash;
     my $syval='';
-    if (($ENV{'request.course.fn'}) && ($ENV{'request.filename'})) {
+    if (($ENV{'request.course.fn'}) && ($thisfn)) {
         if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
                       &GDBM_READER,0640)) {
 	    $syval=$hash{$thisfn};
@@ -1030,6 +1083,7 @@ sub symbread {
         if ($syval) {
            unless ($syval=~/\_\d+$/) {
 	       unless ($ENV{'form.request.prefix'}=~/\.(\d+)\_$/) {
+                  &appenv('request.ambiguous' => $thisfn);
                   return '';
                }    
                $syval.=$1;
@@ -1043,18 +1097,33 @@ 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; }
     }
+    &appenv('request.ambiguous' => $thisfn);
     return '';
 }
 
@@ -1074,7 +1143,7 @@ sub numval {
 
 sub rndseed {
     my $symb;
-    unless ($symb=&symbread($ENV{'request.filename'})) { return ''; }
+    unless ($symb=&symbread()) { return time; }
     my $symbchck=unpack("%32C*",$symb);
     my $symbseed=numval($symb)%$symbchck;
     my $namechck=unpack("%32C*",$ENV{'user.name'});
@@ -1111,11 +1180,21 @@ sub filelocation {
     $location = '/home/httpd/html/res'.$file;
   }
   $location=~s://+:/:g; # remove duplicate /
-  while ($location=~m:/../:) {$location=~ s:/[^/]+/\.\./:/:g;} #remove dir/..
-
+  while ($location=~m:/\.\./:) {$location=~ s:/[^/]+/\.\./:/:g;} #remove dir/..
   return $location;
 }
 
+sub hreflocation {
+    my ($dir,$file)=@_;
+    unless (($_=~/^http:\/\//i) || ($_=~/^\//)) {
+       my $finalpath=filelocation($dir,$file);
+       $finalpath=~s/^\/home\/httpd\/html//;
+       return $finalpath;
+    } else {
+       return $file;
+    }
+}
+
 # ------------------------------------------------------------- Declutters URLs
 
 sub declutter {