--- rat/lonuserstate.pm 2000/08/06 03:25:24 1.3 +++ 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,8/4,8/5 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; @@ -238,43 +238,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.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("
\n"); - my $hashkey; - foreach $hashkey (sort keys %hash) { - $r->print("$hashkey: $hash{$hashkey}