--- rat/lonuserstate.pm 2000/08/06 03:25:24 1.3
+++ rat/lonuserstate.pm 2000/09/04 11:28:04 1.7
@@ -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,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 Gerd Kortemeyer
package Apache::lonuserstate;
@@ -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,100 @@ 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/) {
+ 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);
}
-# ---------------------------------------------------------------- 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("\n");
- my $hashkey;
- foreach $hashkey (sort keys %hash) {
- $r->print("$hashkey: $hash{$hashkey}
\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);
}
- my $i;
- $r->print('
');
- for ($i=0;$i<=$#cond;$i++) {
- $r->print($i.' : '.$cond[$i]."
\n");
+ unless (untie(%hash)) {
+ &Apache::lonnet::logthis("WARNING: ".
+ "Could not untie coursemap $fn for $uri.");
}
- $r->print("$errtext
\n");
- return OK;
+ {
+ 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__