--- rat/lonuserstate.pm	2000/11/01 22:21:36	1.15
+++ rat/lonuserstate.pm	2001/08/30 21:56:55	1.23
@@ -11,7 +11,9 @@
 # 7/1,7/3,7/4,7/7,7/8,7/10 Gerd Kortemeyer)
 #
 # 7/15,7/17,7/18,8/1,8/2,8/4,8/5,8/21,8/22,8/23,8/30,
-# 9/2,9/4,9/29,9/30,10/2,10/11,10/30,10/31,11/1 Gerd Kortemeyer
+# 9/2,9/4,9/29,9/30,10/2,10/11,10/30,10/31,
+# 11/1,11/2,11/14,11/16,11/22,12/28,
+# 07/05/01,08/30 Gerd Kortemeyer
 
 package Apache::lonuserstate;
 
@@ -23,15 +25,17 @@ use Apache::lonnet();
 use GDBM_File;
 use Apache::lonmsg;
 use Safe;
+use Safe::Hole;
 use Opcode;
 
-
 # ---------------------------------------------------- Globals for this package
 
 my $pc;      # Package counter
 my %hash;    # The big tied hash
+my %parmhash;# The hash with the parameters
 my @cond;    # Array with all of the conditions
 my $errtext; # variable with all errors
+my $retfurl; # variable with the very first URL in the course
 
 # --------------------------------------------------------- Loads map from disk
 
@@ -52,6 +56,8 @@ sub loadmap {
        return OK; 
     }
 
+    my $ispage=($fn=~/\.page$/);
+
     unless (-e $fn) {
 	my $returned=Apache::lonnet::repcopy($fn);
         unless ($returned eq OK) {
@@ -95,6 +101,18 @@ sub loadmap {
                     $hash{'kind_'.$rid}='res';
                     $hash{'title_'.$rid}=$token->[2]->{'title'};
                     my $turi=$token->[2]->{'src'};
+                    unless ($ispage) {
+                        $turi=~/\.(\w+)$/;
+                        my $embstyle=&Apache::lonnet::fileembstyle($1);
+                        if ($token->[2]->{'external'} eq 'true') {
+                            $turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//;
+                        } else {
+                           my $embstyle=&Apache::lonnet::fileembstyle($1);
+                           if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
+			       $turi='/adm/wrapper'.$turi;
+                           }
+                        }
+		    }
                     $hash{'src_'.$rid}=$turi;
 
                     if (defined($hash{'ids_'.$turi})) {
@@ -103,7 +121,7 @@ sub loadmap {
                         $hash{'ids_'.$turi}=''.$rid;
                     }
 
-                    if ($token->[2]->{'src'}=~/\/\//) {
+                    if ($token->[2]->{'external'} eq 'true') {
                         $hash{'ext_'.$rid}='true:';
                     } else {
                         $hash{'ext_'.$rid}='false:';
@@ -168,6 +186,23 @@ sub loadmap {
                     } else {
                         $hash{'from_'.$goesto}=''.$linkid;
                     }
+                } elsif ($token->[1] eq 'param') {
+# ------------------------------------------------------------------- Parameter
+
+                    my $referid=$lpc.'.'.$token->[2]->{'to'};
+                    my $part=$token->[2]->{'part'};
+                    unless ($part) { $part=0; }
+                    my $newparam=
+			&Apache::lonnet::escape($token->[2]->{'type'}).':'.
+			&Apache::lonnet::escape($part.'.'.
+                         $token->[2]->{'name'}).'='.
+			&Apache::lonnet::escape($token->[2]->{'value'});
+                    if (defined($hash{'param_'.$referid})) {
+                        $hash{'param_'.$referid}.='&'.$newparam;
+                    } else {
+                        $hash{'param_'.$referid}=''.$newparam;
+                    }
+
                 } 
 
             }
@@ -206,6 +241,9 @@ sub traceroute {
     $sofar=simplify($sofar);
     unless ($beenhere=~/\&$rid\&/) {
        $beenhere.=$rid.'&';  
+       if ($retfurl eq '') {
+           $retfurl=$hash{'src_'.$rid};
+       }
        if (defined($hash{'conditions_'.$rid})) {
 	   $hash{'conditions_'.$rid}=simplify(
            '('.$hash{'conditions_'.$rid}.')|('.$sofar.')');
@@ -239,7 +277,7 @@ sub traceroute {
     }
 }
 
-# ------------------------------------------ Cascading conditions, quick access
+# ------------------------------ Cascading conditions, quick access, parameters
 
 sub accinit {
     my ($uri,$short,$fn)=@_;
@@ -268,18 +306,31 @@ sub accinit {
               $captured{$expr}=$condcounter;
               $acchash{'acc.cond.'.$short.'.'.$condcounter}=$expr;
           } 
-        }
+       } elsif ($_=~/^param_(\d+)\.(\d+)/) {
+          my $prefix=&Apache::lonnet::declutter($hash{'map_id_'.$1}).
+      '___'.$2.'___'.&Apache::lonnet::declutter($hash{'src_'.$1.'.'.$2});
+          map {
+	     my ($typename,$value)=split(/\=/,$_);
+             my ($type,$name)=split(/\:/,$typename);
+             $parmhash{$prefix.'.'.&Apache::lonnet::unescape($name)}=
+                                   &Apache::lonnet::unescape($value);
+	     $parmhash{$prefix.'.'.&Apache::lonnet::unescape($name).'.type'}=
+                                   &Apache::lonnet::unescape($type);
+          } split(/\&/,$hash{$_});
+       }
     } keys %hash;
     map {
 	if ($_=~/^ids/) {
 	  map {
 	    my $resid=$_;
             my $uri=$hash{'src_'.$resid};
+            $uri=~s/^\/adm\/wrapper//;
             my @uriparts=split(/\//,$uri);
             my $urifile=$uriparts[$#uriparts];
             $#uriparts--;
             my $uripath=join('/',@uriparts);
             $uripath=~s/^\/res\///;
+           if ($uripath) {
             my $uricond='0';
             if (defined($hash{'conditions_'.$resid})) {
  		$uricond=$captured{$hash{'conditions_'.$resid}};
@@ -297,7 +348,8 @@ sub accinit {
             } else {
                 $acchash{'acc.res.'.$short.'.'.$uripath}=
                  '&'.$urifile.':'.$uricond.'&';
-            } 
+            }
+           } 
          } split(/\,/,$hash{$_});
       }
     } keys %hash;
@@ -328,8 +380,12 @@ sub readmap {
    unlink($fn.'.db');
    unlink($fn.'_symb.db');
    unlink($fn.'.state');
-   if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT,0640)) {
+   unlink($fn.'parms.db');
+   $retfurl='';
+   if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT,0640)) &&
+       (tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_WRCREAT,0640))) {
     %hash=();
+    %parmhash=();
     $errtext='';
     $pc=0;
     loadmap($uri);
@@ -337,7 +393,7 @@ sub readmap {
         &traceroute('0',$hash{'map_start_'.$uri},'&');
         &accinit($uri,$short,$fn);
     }
-    unless (untie(%hash)) {
+    unless ((untie(%hash)) && (untie(%parmhash))) {
       &Apache::lonnet::logthis("<font color=blue>WARNING: ".
                        "Could not untie coursemap $fn for $uri.</font>"); 
     }
@@ -355,14 +411,13 @@ sub readmap {
                        "Could not tie coursemap $fn for $uri.</font>"); 
    }
    &Apache::lonmsg::author_res_msg($ENV{'request.course.uri'},$errtext);
-   &evalstate();
-   return $errtext;
+   return ($retfurl,$errtext);
 }
 
 # ------------------------------------------------------- Evaluate state string
 
 sub evalstate {
-    my $safeeval = new Safe;
+
     my $fn=$ENV{'request.course.fn'}.'.state';
     my $state='2';
     if (-e $fn) {
@@ -371,15 +426,16 @@ sub evalstate {
         my $fh=Apache::File->new($fn);
         @conditions=<$fh>;
        }  
+       my $safeeval = new Safe;
+       my $safehole = new Safe::Hole;
        $safeeval->permit("entereval");
        $safeeval->permit(":base_math");
        $safeeval->deny(":base_io");
-       $safeeval->share_from('Apache::lonnet',['&varval']);
+       $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
        map {
 	   my $line=$_;
            chomp($line);
 	   my ($condition,$weight)=split(/\:/,$_);
-           $condition=~s/\&([\w\.]+)/\&varval\(\'$1\'\)/g;
            if ($safeeval->reval($condition)) {
 	       if ($weight eq 'force') {
 		   $state.='3';