--- rat/lonuserstate.pm	2000/08/06 03:25:24	1.3
+++ 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 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;
@@ -238,43 +236,123 @@ sub traceroute {
     }
 }
 
-# ---------------------------------------------------- Read map and all submaps
+# ------------------------------------------ Cascading conditions, quick access
 
-sub readmap {
-   my $uri=shift;
-   @cond=('true:normal');
-   %hash=();
-   $errtext='';
-   $pc=0;
-   loadmap($uri);
-   if (defined($hash{'map_start_'.$uri})) {
-       &traceroute('0',$hash{'map_start_'.$uri},'&');
-   }
+sub accinit {
+    my ($uri,$short,$fn)=@_;
+    my %acchash=();
+    my %captured=();
+    my $condcounter=0;
+    $acchash{'acc.cond.'.$short.'.0'}=0;
+    map {
+       if ($_=~/^conditions/) {
+	  my $expr=$hash{$_};
+          map {
+             my $sub=$_;
+             my $orig=$_;
+      $sub=~/\(\((\d+\&(:?\d+\&)*)(?:\d+\&*)+\)(?:\|\(\1(?:\d+\&*)+\))+\)/;
+             my $factor=$1;
+             $sub=~s/$factor//g;
+             $sub=~s/^\(/\($factor\(/;
+	     $sub.=')';
+             $sub=simplify($sub);
+             $orig=~s/(\W)/\\$1/g;
+ 	     $expr=~s/$orig/$sub/;
+	  } ($expr=~m/(\(\(\d+(?:\&\d+)+\)(?:\|\(\d+(?:\&\d+)+\))+\))/g);
+          $hash{$_}=$expr;
+          unless (defined($captured{$expr})) {
+	      $condcounter++;
+              $captured{$expr}=$condcounter;
+              $acchash{'acc.cond.'.$short.'.'.$condcounter}=$expr;
+          } 
+        }
+    } keys %hash;
+    map {
+	if ($_=~/^ids/) {
+	  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})) {
+ 		$uricond=$captured{$hash{'conditions_'.$resid}};
+            }
+            if (defined($acchash{'acc.res.'.$short.'.'.$uripath})) {
+                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.':'.$uricond.'&';
+            } 
+         } split(/\,/,$hash{$_});
+      }
+    } keys %hash;
+    my $courseuri=$uri;
+    $courseuri=~s/^\/res\///;
+    &Apache::lonnet::appenv(%acchash,
+                            "request.course.id"  => $short,
+                            "request.course.fn"  => $fn,
+                            "request.course.uri" => $courseuri); 
 }
 
-# ---------------------------------------------------------------- Testing only
+# ---------------------------------------------------- Read map and all submaps
 
-sub handler {
-    my $r = shift;
-    $r->content_type('text/html');
-    $r->send_http_header;
-    return OK if $r->header_only;
-    readmap('/res/msu/korte/foo.course');
-    $r->print("<html><body>\n");
-    my $hashkey;
-    foreach $hashkey (sort keys %hash) {
-	$r->print("$hashkey: $hash{$hashkey}<br>\n");
+sub readmap {
+   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='';
+    $pc=0;
+    loadmap($uri);
+    if (defined($hash{'map_start_'.$uri})) {
+        &traceroute('0',$hash{'map_start_'.$uri},'&');
+        &accinit($uri,$short,$fn);
     }
-    my $i;
-    $r->print('<hr>');
-    for ($i=0;$i<=$#cond;$i++) {
-        $r->print($i.' : '.$cond[$i]."<br>\n");
+    unless (untie(%hash)) {
+      &Apache::lonnet::logthis("<font color=blue>WARNING: ".
+                       "Could not untie coursemap $fn for $uri.</font>"); 
     }
-    $r->print("<h1>$errtext</h1></body></html>\n");
-    return OK;
+    {
+     my $cfh;
+     if ($cfh=Apache::File->new(">$fn.state")) {
+        print $cfh join("\n",@cond);
+     } else {
+      &Apache::lonnet::logthis("<font color=blue>WARNING: ".
+                       "Could not write statemap $fn for $uri.</font>"); 
+     }
+    }  
+   } else {
+      &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;
 }
-
-    
  
 1;
 __END__