--- rat/lonuserstate.pm	2000/07/18 17:32:32	1.1
+++ rat/lonuserstate.pm	2000/08/06 03:25:24	1.3
@@ -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 Gerd Kortemeyer
+# 7/15,7/17,7/18,8/1,8/2,8/4,8/5 Gerd Kortemeyer
 
 package Apache::lonuserstate;
 
@@ -106,6 +106,12 @@ sub loadmap {
                     }
                     if ($token->[2]->{'type'}) {
 			$hash{'type_'.$rid}=$token->[2]->{'type'};
+                        if ($token->[2]->{'type'} eq 'start') {
+			    $hash{'map_start_'.$uri}="$rid";
+                        }
+                        if ($token->[2]->{'type'} eq 'finish') {
+			    $hash{'map_finish_'.$uri}="$rid";
+                        }
                     }  else {
                         $hash{'type_'.$rid}='normal';
                     }
@@ -113,6 +119,7 @@ sub loadmap {
                     if (($turi=~/\.course$/) ||
                         ($turi=~/\.sequence$/) ||
                         ($turi=~/\.page$/)) {
+                        $hash{'is_map_'.$rid}=1;
                         &loadmap($turi);
                     } 
                     
@@ -122,11 +129,12 @@ sub loadmap {
                     my $rid=$lpc.'.'.$token->[2]->{'id'};
 
                     $hash{'kind_'.$rid}='cond';
-                    $hash{'value_'.$rid}=$token->[2]->{'value'};
+                    $cond[$#cond+1]=$token->[2]->{'value'};
+                    $hash{'condid_'.$rid}=$#cond;
                     if ($token->[2]->{'type'}) {
-			$hash{'type_'.$rid}=$token->[2]->{'type'};
+                        $cond[$#cond].=':'.$token->[2]->{'type'};
                     }  else {
-                        $hash{'type_'.$rid}='normal';
+                        $cond[$#cond].=':normal';
                     }
 
                 } elsif ($token->[1] eq 'link') {
@@ -167,18 +175,85 @@ 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)=@_;
+    $sofar=simplify($sofar);
+    unless ($beenhere=~/\&$rid\&/) {
+       $beenhere.=$rid.'&';  
+       if (defined($hash{'conditions_'.$rid})) {
+	   $hash{'conditions_'.$rid}=simplify(
+           '('.$hash{'conditions_'.$rid}.')|('.$sofar.')');
+       } else {
+           $hash{'conditions_'.$rid}=$sofar;
+       }
+       if (defined($hash{'is_map_'.$rid})) {
+           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})) {
+          map {
+		my $further=$sofar;
+                if ($hash{'undercond_'.$_}) {
+		   if (defined($hash{'condid_'.$hash{'undercond_'.$_}})) {
+  		       $further=simplify('('.$further.')&('.
+                              $hash{'condid_'.$hash{'undercond_'.$_}}.')');
+		   } else {
+                       $errtext.='Undefined condition ID: '
+                                 .$hash{'undercond_'.$_}.'. ';
+                   }
+                }
+                &traceroute($further,$hash{'goesto_'.$_},$beenhere);
+          } split(/\,/,$hash{'to_'.$rid});
+       }
+    }
+}
 
 # ---------------------------------------------------- Read map and all submaps
 
 sub readmap {
    my $uri=shift;
-   @cond=();
+   @cond=('true:normal');
    %hash=();
    $errtext='';
    $pc=0;
    loadmap($uri);
+   if (defined($hash{'map_start_'.$uri})) {
+       &traceroute('0',$hash{'map_start_'.$uri},'&');
+   }
 }
 
+# ---------------------------------------------------------------- Testing only
+
 sub handler {
     my $r = shift;
     $r->content_type('text/html');
@@ -187,9 +262,14 @@ sub handler {
     readmap('/res/msu/korte/foo.course');
     $r->print("<html><body>\n");
     my $hashkey;
-    foreach $hashkey (keys %hash) {
+    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");
+    }
     $r->print("<h1>$errtext</h1></body></html>\n");
     return OK;
 }