--- rat/lonuserstate.pm	2000/11/01 22:21:36	1.15
+++ rat/lonuserstate.pm	2000/11/16 11:58:30	1.19
@@ -11,7 +11,8 @@
 # 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 Gerd Kortemeyer
 
 package Apache::lonuserstate;
 
@@ -25,11 +26,11 @@ use Apache::lonmsg;
 use Safe;
 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
 
@@ -168,6 +169,20 @@ sub loadmap {
                     } else {
                         $hash{'from_'.$goesto}=''.$linkid;
                     }
+                } elsif ($token->[1] eq 'param') {
+# ------------------------------------------------------------------- Parameter
+
+                    my $referid=$lpc.'.'.$token->[2]->{'to'};
+                    my $newparam=
+			&Apache::lonnet::escape($token->[2]->{'type'}).':'.
+			&Apache::lonnet::escape($token->[2]->{'name'}).'='.
+			&Apache::lonnet::escape($token->[2]->{'value'});
+                    if (defined($hash{'param_'.$referid})) {
+                        $hash{'param_'.$referid}.='&'.$newparam;
+                    } else {
+                        $hash{'param_'.$referid}=''.$newparam;
+                    }
+
                 } 
 
             }
@@ -239,7 +254,7 @@ sub traceroute {
     }
 }
 
-# ------------------------------------------ Cascading conditions, quick access
+# ------------------------------ Cascading conditions, quick access, parameters
 
 sub accinit {
     my ($uri,$short,$fn)=@_;
@@ -268,7 +283,18 @@ 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/) {
@@ -328,8 +354,11 @@ 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');
+   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 +366,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,7 +384,6 @@ sub readmap {
                        "Could not tie coursemap $fn for $uri.</font>"); 
    }
    &Apache::lonmsg::author_res_msg($ENV{'request.course.uri'},$errtext);
-   &evalstate();
    return $errtext;
 }
 
@@ -374,12 +402,11 @@ sub evalstate {
        $safeeval->permit("entereval");
        $safeeval->permit(":base_math");
        $safeeval->deny(":base_io");
-       $safeeval->share_from('Apache::lonnet',['&varval']);
+       $safeeval->share_from('Apache::lonnet',['&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';