--- rat/lonuserstate.pm	2000/08/02 15:27:10	1.2
+++ rat/lonuserstate.pm	2000/08/22 15:26:28	1.4
@@ -10,7 +10,7 @@
 # 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 Gerd Kortemeyer
+# 7/15,7/17,7/18,8/1,8/2,8/4,8/5,8/21,8/22 Gerd Kortemeyer
 
 package Apache::lonuserstate;
 
@@ -175,21 +175,49 @@ sub loadmap {
     }
 }
 
+# --------------------------------------------------------- Simplify expression
+
+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;
+# 8|8=8
+   $expression=~s/(\d+)\|\1/$1/g;
+# (5&3)&4=5&3&4
+   $expression=~s/\((\d+)\&(\d+)\)\&(\d+)/$1\&$2\&$3/g;
+# (((5&3)|(4&6)))=((5&3)|(4&6))
+   $expression=~
+       s/\((\(\(\d+(?:\&\d+)*\)(?:\|\(\d+(?:\&\d+)*\))+\))\)/$1/g;
+# ((5&3)|(4&6))|(1&2)=(5&3)|(4&6)|(1&2)
+   $expression=~
+       s/\((\(\d+(?:\&\d+)*\))((?:\|\(\d+(?:\&\d+)*\))+)\)\|(\(\d+(?:\&\d+)*\))/\($1$2\|$3\)/g;
+   return $expression;
+}
+
 # -------------------------------------------------------- Build condition hash
 
 sub traceroute {
-    my ($sofar,$rid,$beenhere)=shift;
+    my ($sofar,$rid,$beenhere)=@_;
+    $sofar=simplify($sofar);
     unless ($beenhere=~/\&$rid\&/) {
        $beenhere.=$rid.'&';  
        if (defined($hash{'conditions_'.$rid})) {
-	   $hash{'conditions_'.$rid}=
-       '('.$hash{'conditions_'.$rid}.')|('.$sofar.')';
+	   $hash{'conditions_'.$rid}=simplify(
+           '('.$hash{'conditions_'.$rid}.')|('.$sofar.')');
        } else {
            $hash{'conditions_'.$rid}=$sofar;
        }
        if (defined($hash{'is_map_'.$rid})) {
-           if () {
-	       &traceroute($sofar,$startrid,'&');
+           if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) {
+	       &traceroute($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},'&');
+               if (defined($hash{'map_finish_'.$hash{'src_'.$rid}})) {
+		   $sofar=
+                  $hash{'conditions_'.$hash{'map_finish_'.$hash{'src_'.$rid}}};
+               }
            }
        }
        if (defined($hash{'to_'.$rid})) {
@@ -197,7 +225,8 @@ sub traceroute {
 		my $further=$sofar;
                 if ($hash{'undercond_'.$_}) {
 		   if (defined($hash{'condid_'.$hash{'undercond_'.$_}})) {
-  		       $further.='&'.$hash{'condid_'.$hash{'undercond_'.$_}};
+  		       $further=simplify('('.$further.')&('.
+                              $hash{'condid_'.$hash{'undercond_'.$_}}.')');
 		   } else {
                        $errtext.='Undefined condition ID: '
                                  .$hash{'undercond_'.$_}.'. ';
@@ -209,40 +238,100 @@ sub traceroute {
     }
 }
 
-# ---------------------------------------------------- Read map and all submaps
+# ------------------------------------------ Cascading conditions, quick access
 
-sub readmap {
-   my $uri=shift;
-   @cond=();
-   %hash=();
-   $errtext='';
-   $pc=0;
-   loadmap($uri);
+sub accinit {
+    my ($uri,$short,$fn)=@_;
+    my %acchash=();
+    my %captured=();
+    my $condcounter=0;
+    $acchash{'acc.cond.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.'.$condcounter}=$expr;
+          } 
+        }
+    } keys %hash;
+    map {
+	if ($_=~/^ids/) {
+	    my $resid=$hash{$_};
+            my $uri=$hash{'src_'.$resid};
+            my @uriparts=split(/\//,$uri);
+            my $urifile=$uriparts[$#uriparts];
+            $#uriparts--;
+            my $uripath=join('/',@uriparts);
+            if (defined($hash{'conditions_'.$resid})) {
+ 		$urifile.=':'.$captured{$hash{'conditions_'.$resid}};
+            } else {
+                $urifile.=':0';
+            }
+            if (defined($acchash{'acc.res.'.$uripath})) {
+		$acchash{'acc.res.'.$uripath}.=$urifile.'&';
+            } else {
+                $acchash{'acc.res.'.$uripath}='&'.$urifile.'&';
+            }
+        }
+    } keys %hash;
+    &Apache::lonnet::appenv(%acchash,
+                            "request.course"    => $short,
+                            "request.course.fn" => $fn); 
 }
 
-# ---------------------------------------------------------------- Testing only
+# ---------------------------------------------------- Read map and all submaps
+
+#
+# Call with uri of course map, short name for course, and filename for
+# binary structure
+#
 
-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");
-    }
-    my $i;
-    $r->print('<hr>');
-    for ($i=0;$i<=$#cond;$i++) {
-        $r->print($i.' : '.$cond[$i]."<br>\n");
+sub readmap {
+   my ($uri,$short,$fn)=@_;
+   @cond=('true:normal');
+   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);
     }
-    $r->print("<h1>$errtext</h1></body></html>\n");
-    return OK;
+    unless (untie(%hash)) {
+      &Apache::lonnet::logthis("<font color=blue>WARNING: ".
+                       "Could not untie coursemap $fn for $uri.</font>"); 
+    }
+    {
+     my $cfh;
+     if ($cfh=Apache::File->new(">$fn.state")) {
+        print $cfh join("\n",@cond);
+     } else {
+      &Apache::lonnet::logthis("<font color=blie>WARNING: ".
+                       "Could not write statemap $fn for $uri.</font>"); 
+     }
+    }  
+   } else {
+      &Apache::lonnet::logthis("<font color=blie>WARNING: ".
+                       "Could not tie coursemap $fn for $uri.</font>"); 
+   }
+   return $errtext;
 }
-
-    
  
 1;
 __END__