version 1.99.2.1, 2006/02/23 08:38:54
|
version 1.104, 2006/02/23 18:08:43
|
Line 406 sub accinit {
|
Line 406 sub accinit {
|
my %captured=(); |
my %captured=(); |
my $condcounter=0; |
my $condcounter=0; |
$acchash{'acc.cond.'.$short.'.0'}=0; |
$acchash{'acc.cond.'.$short.'.0'}=0; |
foreach (keys %hash) { |
foreach my $key (keys(%hash)) { |
if ($_=~/^conditions/) { |
if ($key=~/^conditions/) { |
my $expr=$hash{$_}; |
my $expr=$hash{$key}; |
foreach ($expr=~m/(\(\(\d+(?:\&\d+)+\)(?:\|\(\d+(?:\&\d+)+\))+\))/g) { |
foreach my $sub ($expr=~m/(\(\(\d+(?:\&\d+)+\)(?:\|\(\d+(?:\&\d+)+\))+\))/g) { |
my $sub=$_; |
my $orig=$sub; |
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; |
Line 421 sub accinit {
|
Line 420 sub accinit {
|
$orig=~s/(\W)/\\$1/g; |
$orig=~s/(\W)/\\$1/g; |
$expr=~s/$orig/$sub/; |
$expr=~s/$orig/$sub/; |
} |
} |
$hash{$_}=$expr; |
$hash{$key}=$expr; |
unless (defined($captured{$expr})) { |
unless (defined($captured{$expr})) { |
$condcounter++; |
$condcounter++; |
$captured{$expr}=$condcounter; |
$captured{$expr}=$condcounter; |
$acchash{'acc.cond.'.$short.'.'.$condcounter}=$expr; |
$acchash{'acc.cond.'.$short.'.'.$condcounter}=$expr; |
} |
} |
} elsif ($_=~/^param_(\d+)\.(\d+)/) { |
} elsif ($key=~/^param_(\d+)\.(\d+)/) { |
my $prefix=&Apache::lonnet::encode_symb($hash{'map_id_'.$1},$2, |
my $prefix=&Apache::lonnet::encode_symb($hash{'map_id_'.$1},$2, |
$hash{'src_'.$1.'.'.$2}); |
$hash{'src_'.$1.'.'.$2}); |
foreach (split(/\&/,$hash{$_})) { |
foreach my $param (split(/\&/,$hash{$key})) { |
my ($typename,$value)=split(/\=/,$_); |
my ($typename,$value)=split(/\=/,$param); |
my ($type,$name)=split(/\:/,$typename); |
my ($type,$name)=split(/\:/,$typename); |
$parmhash{$prefix.'.'.&Apache::lonnet::unescape($name)}= |
$parmhash{$prefix.'.'.&Apache::lonnet::unescape($name)}= |
&Apache::lonnet::unescape($value); |
&Apache::lonnet::unescape($value); |
Line 440 sub accinit {
|
Line 439 sub accinit {
|
} |
} |
} |
} |
} |
} |
foreach (keys %hash) { |
foreach my $key (keys(%hash)) { |
if ($_=~/^ids/) { |
if ($key=~/^ids/) { |
foreach (split(/\,/,$hash{$_})) { |
foreach my $resid (split(/\,/,$hash{$key})) { |
my $resid=$_; |
|
my $uri=$hash{'src_'.$resid}; |
my $uri=$hash{'src_'.$resid}; |
$uri=~s/^\/adm\/wrapper//; |
my ($uripath,$urifile) = |
$uri=&Apache::lonnet::declutter($uri); |
&Apache::lonnet::split_uri_for_cond($uri); |
my @uriparts=split(/\//,$uri); |
|
my $urifile=$uriparts[$#uriparts]; |
|
$#uriparts--; |
|
my $uripath=join('/',@uriparts); |
|
if ($uripath) { |
if ($uripath) { |
my $uricond='0'; |
my $uricond='0'; |
if (defined($hash{'conditions_'.$resid})) { |
if (defined($hash{'conditions_'.$resid})) { |
Line 462 sub accinit {
|
Line 456 sub accinit {
|
my $replace=$1; |
my $replace=$1; |
my $regexp=$replace; |
my $regexp=$replace; |
#$regexp=~s/\|/\\\|/g; |
#$regexp=~s/\|/\\\|/g; |
$acchash{'acc.res.'.$short.'.'.$uripath} |
$acchash{'acc.res.'.$short.'.'.$uripath}=~ |
=~s/\Q$regexp\E/$replace\|$uricond/; |
s/\Q$regexp\E/$replace\|$uricond/; |
} else { |
} else { |
$acchash{'acc.res.'.$short.'.'.$uripath}.= |
$acchash{'acc.res.'.$short.'.'.$uripath}.= |
$urifile.':'.$uricond.'&'; |
$urifile.':'.$uricond.'&'; |