--- rat/lonuserstate.pm 2000/07/18 17:32:32 1.1
+++ rat/lonuserstate.pm 2000/08/31 10:14:08 1.6
@@ -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,8/21,8/22,8/23,8/30 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,34 +175,163 @@ sub loadmap {
}
}
+# --------------------------------------------------------- Simplify expression
-# ---------------------------------------------------- Read map and all submaps
-
-sub readmap {
- my $uri=shift;
- @cond=();
- %hash=();
- $errtext='';
- $pc=0;
- loadmap($uri);
+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;
}
-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("\n");
- my $hashkey;
- foreach $hashkey (keys %hash) {
- $r->print("$hashkey: $hash{$hashkey}
\n");
+# -------------------------------------------------------- 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});
+ }
}
- $r->print("$errtext
\n");
- return OK;
}
-
+# ------------------------------------------ Cascading conditions, quick access
+
+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/) {
+ 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.'.$short.'.'.$uripath})) {
+ $acchash{'acc.res.'.$short.'.'.$uripath}.=$urifile.'&';
+ } else {
+ $acchash{'acc.res.'.$short.'.'.$uripath}='&'.$urifile.'&';
+ }
+ }
+ } keys %hash;
+ &Apache::lonnet::appenv(%acchash,
+ "request.course" => $short,
+ "request.course.fn" => $fn);
+}
+
+# ---------------------------------------------------- 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)=@_;
+ @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);
+ }
+ unless (untie(%hash)) {
+ &Apache::lonnet::logthis("WARNING: ".
+ "Could not untie coursemap $fn for $uri.");
+ }
+ {
+ my $cfh;
+ if ($cfh=Apache::File->new(">$fn.state")) {
+ print $cfh join("\n",@cond);
+ } else {
+ &Apache::lonnet::logthis("WARNING: ".
+ "Could not write statemap $fn for $uri.");
+ }
+ }
+ } else {
+ &Apache::lonnet::logthis("WARNING: ".
+ "Could not tie coursemap $fn for $uri.");
+ }
+ return $errtext;
+}
1;
__END__