--- rat/lonuserstate.pm 2000/08/02 15:27:10 1.2 +++ rat/lonuserstate.pm 2000/10/02 16:16:06 1.10 @@ -10,7 +10,8 @@ # 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,8/23,8/30, +# 9/2,9/4,9/29,9/30,10/2 Gerd Kortemeyer package Apache::lonuserstate; @@ -41,8 +42,7 @@ sub loadmap { my $fn='/home/httpd/html'.$uri; - unless (($fn=~/\.course$/) || - ($fn=~/\.sequence$/) || + unless (($fn=~/\.sequence$/) || ($fn=~/\.page$/)) { $errtext.="Invalid map: $fn\n"; return OK; @@ -116,8 +116,7 @@ sub loadmap { $hash{'type_'.$rid}='normal'; } - if (($turi=~/\.course$/) || - ($turi=~/\.sequence$/) || + if (($turi=~/\.sequence$/) || ($turi=~/\.page$/)) { $hash{'is_map_'.$rid}=1; &loadmap($turi); @@ -175,21 +174,47 @@ sub loadmap { } } +# --------------------------------------------------------- Simplify expression + +sub simplify { + my $expression=shift; +# (8)=8 + $expression=~s/\((\d+)\)/$1/g; +# 8&8=8 + $expression=~s/(\D)(\d+)\&\2(\D)/$1$2$3/g; +# 8|8=8 + $expression=~s/(\D)(\d+)\|\2(\D)/$1$2$3/g; +# (5&3)&4=5&3&4 + $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; +# ((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 +222,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 +235,109 @@ 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.'.$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); + $uripath=~s/^\/res\///; + 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; + my $courseuri=$uri; + $courseuri=~s/^\/res\///; + &Apache::lonnet::appenv(%acchash, + "request.course.id" => $short, + "request.course.fn" => $fn, + "request.course.uri" => $courseuri); } -# ---------------------------------------------------------------- Testing only +# ---------------------------------------------------- Read map and all submaps -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"); - } - my $i; - $r->print('
'); - for ($i=0;$i<=$#cond;$i++) { - $r->print($i.' : '.$cond[$i]."
\n"); +sub readmap { + my $short=shift; + $short=~s/^\///; + my %cenv=&Apache::lonnet::coursedescription($short); + my $fn=$cenv{'fn'}; + my $uri; + $short=~s/\//\_/g; + unless ($uri=$cenv{'url'}) { + &Apache::lonnet::logthis("WARNING: ". + "Could not load course $short."); + return 'No course data available.'; + } + @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."); } - $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__