version 1.6, 2000/08/31 10:14:08
|
version 1.11, 2000/10/11 18:31:00
|
Line 10
|
Line 10
|
# 7/1 Gerd Kortemeyer) |
# 7/1 Gerd Kortemeyer) |
# 7/1,7/3,7/4,7/7,7/8,7/10 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,8/23,8/30 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 Gerd Kortemeyer |
|
|
package Apache::lonuserstate; |
package Apache::lonuserstate; |
|
|
Line 41 sub loadmap {
|
Line 42 sub loadmap {
|
|
|
my $fn='/home/httpd/html'.$uri; |
my $fn='/home/httpd/html'.$uri; |
|
|
unless (($fn=~/\.course$/) || |
unless (($fn=~/\.sequence$/) || |
($fn=~/\.sequence$/) || |
|
($fn=~/\.page$/)) { |
($fn=~/\.page$/)) { |
$errtext.="Invalid map: $fn\n"; |
$errtext.="Invalid map: $fn\n"; |
return OK; |
return OK; |
Line 116 sub loadmap {
|
Line 116 sub loadmap {
|
$hash{'type_'.$rid}='normal'; |
$hash{'type_'.$rid}='normal'; |
} |
} |
|
|
if (($turi=~/\.course$/) || |
if (($turi=~/\.sequence$/) || |
($turi=~/\.sequence$/) || |
|
($turi=~/\.page$/)) { |
($turi=~/\.page$/)) { |
$hash{'is_map_'.$rid}=1; |
$hash{'is_map_'.$rid}=1; |
&loadmap($turi); |
&loadmap($turi); |
Line 179 sub loadmap {
|
Line 178 sub loadmap {
|
|
|
sub simplify { |
sub simplify { |
my $expression=shift; |
my $expression=shift; |
# "True and" is nothing |
|
$expression=~s/0\&//g; |
|
# (8)=8 |
# (8)=8 |
$expression=~s/\((\d+)\)/$1/g; |
$expression=~s/\((\d+)\)/$1/g; |
# 8&8=8 |
# 8&8=8 |
$expression=~s/(\d+)\&\1/$1/g; |
$expression=~s/(\D)(\d+)\&\2(\D)/$1$2$3/g; |
# 8|8=8 |
# 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 |
# (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)) |
# (((5&3)|(4&6)))=((5&3)|(4&6)) |
$expression=~ |
$expression=~ |
s/\((\(\(\d+(?:\&\d+)*\)(?:\|\(\d+(?:\&\d+)*\))+\))\)/$1/g; |
s/\((\(\(\d+(?:\&\d+)*\)(?:\|\(\d+(?:\&\d+)*\))+\))\)/$1/g; |
Line 252 sub accinit {
|
Line 249 sub accinit {
|
map { |
map { |
my $sub=$_; |
my $sub=$_; |
my $orig=$_; |
my $orig=$_; |
$sub=~/\(\((\d+(:?\&\d+)*)(?:\&\d+)+\)(?:\|\(\1(?:\&\d+)+\))+\)/; |
$sub=~/\(\((\d+\&(:?\d+\&)*)(?:\d+\&*)+\)(?:\|\(\1(?:\d+\&*)+\))+\)/; |
my $factor=$1; |
my $factor=$1; |
$sub=~s/$factor\&//g; |
$sub=~s/$factor//g; |
$sub=~s/^\(/\($factor\&\(/; |
$sub=~s/^\(/\($factor\(/; |
$sub.=')'; |
$sub.=')'; |
$sub=simplify($sub); |
$sub=simplify($sub); |
$orig=~s/(\W)/\\$1/g; |
$orig=~s/(\W)/\\$1/g; |
$expr=~s/$orig/$sub/; |
$expr=~s/$orig/$sub/; |
} ($expr=~m/(\(\(\d+(?:\&\d+)+\)(?:\|\(\d+(?:\&\d+)+\))+\))/g); |
} ($expr=~m/(\(\(\d+(?:\&\d+)+\)(?:\|\(\d+(?:\&\d+)+\))+\))/g); |
$hash{$_}=$expr; |
$hash{$_}=$expr; |
unless (defined($captured{$expr})) { |
unless (defined($captured{$expr})) { |
Line 277 sub accinit {
|
Line 274 sub accinit {
|
my $urifile=$uriparts[$#uriparts]; |
my $urifile=$uriparts[$#uriparts]; |
$#uriparts--; |
$#uriparts--; |
my $uripath=join('/',@uriparts); |
my $uripath=join('/',@uriparts); |
|
$uripath=~s/^\/res\///; |
if (defined($hash{'conditions_'.$resid})) { |
if (defined($hash{'conditions_'.$resid})) { |
$urifile.=':'.$captured{$hash{'conditions_'.$resid}}; |
$urifile.=':'.$captured{$hash{'conditions_'.$resid}}; |
} else { |
} else { |
Line 289 sub accinit {
|
Line 287 sub accinit {
|
} |
} |
} |
} |
} keys %hash; |
} keys %hash; |
|
my $courseuri=$uri; |
|
$courseuri=~s/^\/res\///; |
&Apache::lonnet::appenv(%acchash, |
&Apache::lonnet::appenv(%acchash, |
"request.course" => $short, |
"request.course.id" => $short, |
"request.course.fn" => $fn); |
"request.course.fn" => $fn, |
|
"request.course.uri" => $courseuri); |
} |
} |
|
|
# ---------------------------------------------------- Read map and all submaps |
# ---------------------------------------------------- Read map and all submaps |
|
|
# |
|
# Call with uri of course map, short name for course, and filename for |
|
# binary structure |
|
# |
|
|
|
sub readmap { |
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("<font color=blue>WARNING: ". |
|
"Could not load course $short.</font>"); |
|
return 'No course data available.'; |
|
} |
@cond=('true:normal'); |
@cond=('true:normal'); |
|
unlink($fn.'.db'); |
|
unlink($fn.'_symb.db'); |
|
unlink($fn.'.state'); |
if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT,0640)) { |
if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT,0640)) { |
%hash=(); |
%hash=(); |
$errtext=''; |
$errtext=''; |