--- rat/lonuserstate.pm	2000/11/01 22:21:36	1.15
+++ rat/lonuserstate.pm	2000/11/02 17:46:43	1.17
@@ -11,7 +11,7 @@
 # 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 Gerd Kortemeyer
 
 package Apache::lonuserstate;
 
@@ -25,7 +25,6 @@ use Apache::lonmsg;
 use Safe;
 use Opcode;
 
-
 # ---------------------------------------------------- Globals for this package
 
 my $pc;      # Package counter
@@ -355,7 +354,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 +372,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';