--- rat/lonuserstate.pm 2000/08/22 15:26:28 1.4
+++ rat/lonuserstate.pm 2000/11/14 11:13:12 1.18
@@ -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,8/4,8/5,8/21,8/22 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,10/11,10/30,10/31,11/1,11/2,11/14 Gerd Kortemeyer
package Apache::lonuserstate;
@@ -20,6 +21,9 @@ use Apache::File;
use HTML::TokeParser;
use Apache::lonnet();
use GDBM_File;
+use Apache::lonmsg;
+use Safe;
+use Opcode;
# ---------------------------------------------------- Globals for this package
@@ -41,8 +45,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 +119,7 @@ sub loadmap {
$hash{'type_'.$rid}='normal';
}
- if (($turi=~/\.course$/) ||
- ($turi=~/\.sequence$/) ||
+ if (($turi=~/\.sequence$/) ||
($turi=~/\.page$/)) {
$hash{'is_map_'.$rid}=1;
&loadmap($turi);
@@ -165,6 +167,20 @@ sub loadmap {
} else {
$hash{'from_'.$goesto}=''.$linkid;
}
+ } elsif ($token->[1] eq 'param') {
+# ------------------------------------------------------------------- Parameter
+
+ my $referid=$lpc.'.'.$token->[2]->{'to'};
+ my $newparam=
+ &Apache::lonnet::escape($token->[2]->{'type'}).':'.
+ &Apache::lonnet::escape($token->[2]->{'name'}).'='.
+ &Apache::lonnet::escape($token->[2]->{'value'});
+ if (defined($hash{'param_'.$referid})) {
+ $hash{'param_'.$referid}.='&'.$newparam;
+ } else {
+ $hash{'param_'.$referid}=''.$newparam;
+ }
+
}
}
@@ -179,16 +195,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;
@@ -245,65 +259,88 @@ sub accinit {
my %acchash=();
my %captured=();
my $condcounter=0;
- $acchash{'acc.cond.0'}='0';
+ $acchash{'acc.cond.'.$short.'.0'}=0;
map {
if ($_=~/^conditions/) {
my $expr=$hash{$_};
map {
my $sub=$_;
my $orig=$_;
- $sub=~/\(\((\d+(:?\&\d+)*)(?:\&\d+)+\)(?:\|\(\1(?:\&\d+)+\))+\)/;
+ $sub=~/\(\((\d+\&(:?\d+\&)*)(?:\d+\&*)+\)(?:\|\(\1(?:\d+\&*)+\))+\)/;
my $factor=$1;
- $sub=~s/$factor\&//g;
- $sub=~s/^\(/\($factor\&\(/;
+ $sub=~s/$factor//g;
+ $sub=~s/^\(/\($factor\(/;
$sub.=')';
$sub=simplify($sub);
$orig=~s/(\W)/\\$1/g;
- $expr=~s/$orig/$sub/;
+ $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;
+ $acchash{'acc.cond.'.$short.'.'.$condcounter}=$expr;
}
}
} keys %hash;
map {
if ($_=~/^ids/) {
- my $resid=$hash{$_};
+ map {
+ my $resid=$_;
my $uri=$hash{'src_'.$resid};
my @uriparts=split(/\//,$uri);
my $urifile=$uriparts[$#uriparts];
$#uriparts--;
my $uripath=join('/',@uriparts);
+ $uripath=~s/^\/res\///;
+ my $uricond='0';
if (defined($hash{'conditions_'.$resid})) {
- $urifile.=':'.$captured{$hash{'conditions_'.$resid}};
- } else {
- $urifile.=':0';
+ $uricond=$captured{$hash{'conditions_'.$resid}};
}
- if (defined($acchash{'acc.res.'.$uripath})) {
- $acchash{'acc.res.'.$uripath}.=$urifile.'&';
+ if (defined($acchash{'acc.res.'.$short.'.'.$uripath})) {
+ if ($acchash{'acc.res.'.$short.'.'.$uripath}=~
+ /(\&$urifile\:[^\&]*)/) {
+ my $replace=$1;
+ $acchash{'acc.res.'.$short.'.'.$uripath}
+ =~s/$replace/$replace\|$uricond/;
+ } else {
+ $acchash{'acc.res.'.$short.'.'.$uripath}.=
+ $urifile.':'.$uricond.'&';
+ }
} else {
- $acchash{'acc.res.'.$uripath}='&'.$urifile.'&';
- }
- }
+ $acchash{'acc.res.'.$short.'.'.$uripath}=
+ '&'.$urifile.':'.$uricond.'&';
+ }
+ } split(/\,/,$hash{$_});
+ }
} keys %hash;
+ my $courseuri=$uri;
+ $courseuri=~s/^\/res\///;
+ &Apache::lonnet::delenv('(acc\.|httpref\.|resource\.parms)');
&Apache::lonnet::appenv(%acchash,
- "request.course" => $short,
- "request.course.fn" => $fn);
+ "request.course.id" => $short,
+ "request.course.fn" => $fn,
+ "request.course.uri" => $courseuri);
}
# ---------------------------------------------------- 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)=@_;
+ 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');
+ unlink($fn.'.db');
+ unlink($fn.'_symb.db');
+ unlink($fn.'.state');
if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT,0640)) {
%hash=();
$errtext='';
@@ -322,17 +359,57 @@ sub readmap {
if ($cfh=Apache::File->new(">$fn.state")) {
print $cfh join("\n",@cond);
} else {
- &Apache::lonnet::logthis("WARNING: ".
+ &Apache::lonnet::logthis("WARNING: ".
"Could not write statemap $fn for $uri.");
}
}
} else {
- &Apache::lonnet::logthis("WARNING: ".
+ &Apache::lonnet::logthis("WARNING: ".
"Could not tie coursemap $fn for $uri.");
}
+ &Apache::lonmsg::author_res_msg($ENV{'request.course.uri'},$errtext);
return $errtext;
}
-
+
+# ------------------------------------------------------- Evaluate state string
+
+sub evalstate {
+ my $safeeval = new Safe;
+ my $fn=$ENV{'request.course.fn'}.'.state';
+ my $state='2';
+ if (-e $fn) {
+ my @conditions=();
+ {
+ my $fh=Apache::File->new($fn);
+ @conditions=<$fh>;
+ }
+ $safeeval->permit("entereval");
+ $safeeval->permit(":base_math");
+ $safeeval->deny(":base_io");
+ $safeeval->share_from('Apache::lonnet',['&EXT']);
+ map {
+ my $line=$_;
+ chomp($line);
+ my ($condition,$weight)=split(/\:/,$_);
+ if ($safeeval->reval($condition)) {
+ if ($weight eq 'force') {
+ $state.='3';
+ } else {
+ $state.='2';
+ }
+ } else {
+ if ($weight eq 'stop') {
+ $state.='0';
+ } else {
+ $state.='1';
+ }
+ }
+ } @conditions;
+ }
+ &Apache::lonnet::appenv('user.state.'.$ENV{'request.course.id'} => $state);
+ return $state;
+}
+
1;
__END__