--- rat/lonuserstate.pm	2000/08/31 10:14:08	1.6
+++ rat/lonuserstate.pm	2000/10/30 15:12:49	1.13
@@ -10,7 +10,8 @@
 # 7/1 Gerd Kortemeyer)
 # 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 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 Gerd Kortemeyer
 
 package Apache::lonuserstate;
 
@@ -20,6 +21,7 @@ use Apache::File;
 use HTML::TokeParser;
 use Apache::lonnet();
 use GDBM_File;
+use Apache::lonmsg;
 
 # ---------------------------------------------------- Globals for this package
 
@@ -41,8 +43,7 @@ sub loadmap {
 
     my $fn='/home/httpd/html'.$uri;
 
-    unless (($fn=~/\.course$/) ||
-            ($fn=~/\.sequence$/) ||
+    unless (($fn=~/\.sequence$/) ||
             ($fn=~/\.page$/)) { 
        $errtext.="Invalid map: $fn\n";
        return OK; 
@@ -116,8 +117,7 @@ sub loadmap {
                         $hash{'type_'.$rid}='normal';
                     }
 
-                    if (($turi=~/\.course$/) ||
-                        ($turi=~/\.sequence$/) ||
+                    if (($turi=~/\.sequence$/) ||
                         ($turi=~/\.page$/)) {
                         $hash{'is_map_'.$rid}=1;
                         &loadmap($turi);
@@ -179,16 +179,14 @@ sub loadmap {
 
 sub simplify {
    my $expression=shift;
-# "True and" is nothing 
-   $expression=~s/0\&//g;
 # (8)=8
    $expression=~s/\((\d+)\)/$1/g;
 # 8&8=8
-   $expression=~s/(\d+)\&\1/$1/g;
+   $expression=~s/(\D)(\d+)\&\2(\D)/$1$2$3/g;
 # 8|8=8
-   $expression=~s/(\d+)\|\1/$1/g;
+   $expression=~s/(\D)(\d+)\|\2(\D)/$1$2$3/g;
 # (5&3)&4=5&3&4
-   $expression=~s/\((\d+)\&(\d+)\)\&(\d+)/$1\&$2\&$3/g;
+   $expression=~s/\((\d+)((?:\&\d+)+)\)\&(\d+\D)/$1$2\&$3/g;
 # (((5&3)|(4&6)))=((5&3)|(4&6))
    $expression=~
        s/\((\(\(\d+(?:\&\d+)*\)(?:\|\(\d+(?:\&\d+)*\))+\))\)/$1/g;
@@ -252,14 +250,14 @@ sub accinit {
           map {
              my $sub=$_;
              my $orig=$_;
-             $sub=~/\(\((\d+(:?\&\d+)*)(?:\&\d+)+\)(?:\|\(\1(?:\&\d+)+\))+\)/;
+      $sub=~/\(\((\d+\&(:?\d+\&)*)(?:\d+\&*)+\)(?:\|\(\1(?:\d+\&*)+\))+\)/;
              my $factor=$1;
-             $sub=~s/$factor\&//g;
-             $sub=~s/^\(/\($factor\&\(/;
+             $sub=~s/$factor//g;
+             $sub=~s/^\(/\($factor\(/;
 	     $sub.=')';
              $sub=simplify($sub);
              $orig=~s/(\W)/\\$1/g;
-	     $expr=~s/$orig/$sub/;
+ 	     $expr=~s/$orig/$sub/;
 	  } ($expr=~m/(\(\(\d+(?:\&\d+)+\)(?:\|\(\d+(?:\&\d+)+\))+\))/g);
           $hash{$_}=$expr;
           unless (defined($captured{$expr})) {
@@ -271,39 +269,61 @@ sub accinit {
     } keys %hash;
     map {
 	if ($_=~/^ids/) {
-	    my $resid=$hash{$_};
+	  map {
+	    my $resid=$_;
             my $uri=$hash{'src_'.$resid};
             my @uriparts=split(/\//,$uri);
             my $urifile=$uriparts[$#uriparts];
             $#uriparts--;
             my $uripath=join('/',@uriparts);
+            $uripath=~s/^\/res\///;
+            my $uricond='0';
             if (defined($hash{'conditions_'.$resid})) {
- 		$urifile.=':'.$captured{$hash{'conditions_'.$resid}};
-            } else {
-                $urifile.=':0';
+ 		$uricond=$captured{$hash{'conditions_'.$resid}};
             }
             if (defined($acchash{'acc.res.'.$short.'.'.$uripath})) {
-		$acchash{'acc.res.'.$short.'.'.$uripath}.=$urifile.'&';
+                if ($acchash{'acc.res.'.$short.'.'.$uripath}=~
+                   /(\&$urifile\:[^\&]*)/) {
+		    my $replace=$1;
+                    $acchash{'acc.res.'.$short.'.'.$uripath}
+                     =~s/$replace/$replace\|$uricond/;
+                } else {
+		   $acchash{'acc.res.'.$short.'.'.$uripath}.=
+                     $urifile.':'.$uricond.'&';
+	        }
             } else {
-                $acchash{'acc.res.'.$short.'.'.$uripath}='&'.$urifile.'&';
-            }
-        }
+                $acchash{'acc.res.'.$short.'.'.$uripath}=
+                 '&'.$urifile.':'.$uricond.'&';
+            } 
+         } split(/\,/,$hash{$_});
+      }
     } keys %hash;
+    my $courseuri=$uri;
+    $courseuri=~s/^\/res\///;
     &Apache::lonnet::appenv(%acchash,
-                            "request.course"    => $short,
-                            "request.course.fn" => $fn); 
+                            "request.course.id"  => $short,
+                            "request.course.fn"  => $fn,
+                            "request.course.uri" => $courseuri); 
 }
 
 # ---------------------------------------------------- Read map and all submaps
 
-#
-# Call with uri of course map, short name for course, and filename for
-# binary structure
-#
-
 sub readmap {
-   my ($uri,$short,$fn)=@_;
+   my $short=shift;
+   $short=~s/^\///;
+   my %cenv=&Apache::lonnet::coursedescription($short);
+   my $fn=$cenv{'fn'};
+   my $uri;
+   $short=~s/\//\_/g;
+   unless ($uri=$cenv{'url'}) { 
+      &Apache::lonnet::logthis("<font color=blue>WARNING: ".
+                       "Could not load course $short.</font>"); 
+      return 'No course data available.';
+   }
    @cond=('true:normal');
+   unlink($fn.'.db');
+   unlink($fn.'_symb.db');
+   unlink($fn.'.state');
    if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT,0640)) {
     %hash=();
     $errtext='';
@@ -330,6 +350,7 @@ sub readmap {
       &Apache::lonnet::logthis("<font color=blue>WARNING: ".
                        "Could not tie coursemap $fn for $uri.</font>"); 
    }
+   &Apache::lonmsg::author_res_msg($ENV{'request.course.uri'},$errtext);
    return $errtext;
 }