version 1.102, 2006/02/22 22:36:34
|
version 1.105, 2006/02/23 18:17:37
|
Line 319 sub loadmap {
|
Line 319 sub loadmap {
|
sub simplify { |
sub simplify { |
my $expression=shift; |
my $expression=shift; |
# (0&1) = 1 |
# (0&1) = 1 |
$expression=~s/\(0\&(\d+)\)/$1/g; |
$expression=~s/\(0\&([_\.\d]+)\)/$1/g; |
# (8)=8 |
# (8)=8 |
$expression=~s/\((\d+)\)/$1/g; |
$expression=~s/\(([_\.\d]+)\)/$1/g; |
# 8&8=8 |
# 8&8=8 |
$expression=~s/(\D)(\d+)\&\2(\D)/$1$2$3/g; |
$expression=~s/([^_\.\d])([_\.\d]+)\&\2([^_\.\d])/$1$2$3/g; |
# 8|8=8 |
# 8|8=8 |
$expression=~s/(\D)(\d+)\|\2(\D)/$1$2$3/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+\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; |
# ((5&3)|(4&6))|(1&2)=(5&3)|(4&6)|(1&2) |
# ((5&3)|(4&6))|(1&2)=(5&3)|(4&6)|(1&2) |
$expression=~ |
$expression=~ |
s/\((\(\d+(?:\&\d+)*\))((?:\|\(\d+(?:\&\d+)*\))+)\)\|(\(\d+(?:\&\d+)*\))/\($1$2\|$3\)/g; |
s/\((\([_\.\d]+(?:\&[_\.\d]+)*\))((?:\|\([_\.\d]+(?:\&[_\.\d]+)*\))+)\)\|(\([_\.\d]+(?:\&[_\.\d]+)*\))/\($1$2\|$3\)/g; |
return $expression; |
return $expression; |
} |
} |
|
|
Line 364 sub traceroute {
|
Line 364 sub traceroute {
|
} |
} |
if (defined($hash{'conditions_'.$rid})) { |
if (defined($hash{'conditions_'.$rid})) { |
$hash{'conditions_'.$rid}=simplify( |
$hash{'conditions_'.$rid}=simplify( |
'('.'conditions_'.$rid.')|('.$sofar.')'); |
'('.$hash{'conditions_'.$rid}.')|('.$sofar.')'); |
} else { |
} else { |
$hash{'conditions_'.$rid}=$sofar; |
$hash{'conditions_'.$rid}=$sofar; |
} |
} |
$newsofar='conditions_'.$rid; |
$newsofar='_'.$rid; |
if (defined($hash{'is_map_'.$rid})) { |
if (defined($hash{'is_map_'.$rid})) { |
if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) { |
if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) { |
$sofar=$newsofar= |
$sofar=$newsofar= |
Line 383 sub traceroute {
|
Line 383 sub traceroute {
|
my $further=$sofar; |
my $further=$sofar; |
if ($hash{'undercond_'.$_}) { |
if ($hash{'undercond_'.$_}) { |
if (defined($hash{'condid_'.$hash{'undercond_'.$_}})) { |
if (defined($hash{'condid_'.$hash{'undercond_'.$_}})) { |
$further=simplify('('.$further.')&('. |
$further=simplify('('.'_'.$rid.')&('. |
$hash{'condid_'.$hash{'undercond_'.$_}}.')'); |
$hash{'condid_'.$hash{'undercond_'.$_}}.')'); |
} else { |
} else { |
$errtext.='Undefined condition ID: ' |
$errtext.='Undefined condition ID: ' |
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; |
$sub=~s/^\(/\($factor\(/; |
$sub=~s/^\(/\($factor\(/; |
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}; |
my ($uripath,$urifile) = |
my ($uripath,$urifile) = |
&Apache::lonnet::split_uri_for_cond($uri); |
&Apache::lonnet::split_uri_for_cond($uri); |
Line 458 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.'&'; |