version 1.104, 2006/02/23 18:08:43
|
version 1.112, 2006/05/12 15:30:53
|
Line 93 sub processversionfile {
|
Line 93 sub processversionfile {
|
my %versions=&Apache::lonnet::dump('resourceversions', |
my %versions=&Apache::lonnet::dump('resourceversions', |
$cenv{'domain'}, |
$cenv{'domain'}, |
$cenv{'num'}); |
$cenv{'num'}); |
foreach (keys %versions) { |
foreach my $ver (keys(%versions)) { |
if ($_=~/^error\:/) { return; } |
if ($ver=~/^error\:/) { return; } |
$hash{'version_'.$_}=$versions{$_}; |
$hash{'version_'.$ver}=$versions{$ver}; |
} |
} |
} |
} |
|
|
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 368 sub traceroute {
|
Line 368 sub traceroute {
|
} else { |
} else { |
$hash{'conditions_'.$rid}=$sofar; |
$hash{'conditions_'.$rid}=$sofar; |
} |
} |
$newsofar=$hash{'conditions_'.$rid}; |
|
|
# if the expression is just the 0th condition keep it |
|
# otherwise leave a pointer to this condition expression |
|
$newsofar = ($sofar eq '0') ? $sofar : '_'.$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 379 sub traceroute {
|
Line 383 sub traceroute {
|
} |
} |
} |
} |
if (defined($hash{'to_'.$rid})) { |
if (defined($hash{'to_'.$rid})) { |
foreach (split(/\,/,$hash{'to_'.$rid})) { |
foreach my $id (split(/\,/,$hash{'to_'.$rid})) { |
my $further=$sofar; |
my $further=$sofar; |
if ($hash{'undercond_'.$_}) { |
if ($hash{'undercond_'.$id}) { |
if (defined($hash{'condid_'.$hash{'undercond_'.$_}})) { |
if (defined($hash{'condid_'.$hash{'undercond_'.$id}})) { |
$further=simplify('('.$further.')&('. |
$further=simplify('('.'_'.$rid.')&('. |
$hash{'condid_'.$hash{'undercond_'.$_}}.')'); |
$hash{'condid_'.$hash{'undercond_'.$id}}.')'); |
} else { |
} else { |
$errtext.='Undefined condition ID: ' |
$errtext.='Undefined condition ID: ' |
.$hash{'undercond_'.$_}.'. '; |
.$hash{'undercond_'.$id}.'. '; |
} |
} |
} |
} |
$newsofar=&traceroute($further,$hash{'goesto_'.$_},$beenhere, |
$newsofar=&traceroute($further,$hash{'goesto_'.$id},$beenhere, |
$encflag,$hdnflag); |
$encflag,$hdnflag); |
} |
} |
} |
} |
Line 409 sub accinit {
|
Line 413 sub accinit {
|
foreach my $key (keys(%hash)) { |
foreach my $key (keys(%hash)) { |
if ($key=~/^conditions/) { |
if ($key=~/^conditions/) { |
my $expr=$hash{$key}; |
my $expr=$hash{$key}; |
foreach my $sub ($expr=~m/(\(\(\d+(?:\&\d+)+\)(?:\|\(\d+(?:\&\d+)+\))+\))/g) { |
# try to find and factor out common sub-expressions |
|
foreach my $sub ($expr=~m/(\(\([_\.\d]+(?:\&[_\.\d]+)+\)(?:\|\([_\.\d]+(?:\&[_\.\d]+)+\))+\))/g) { |
my $orig=$sub; |
my $orig=$sub; |
$sub=~/\(\((\d+\&(:?\d+\&)*)(?:\d+\&*)+\)(?:\|\(\1(?:\d+\&*)+\))+\)/; |
|
my $factor=$1; |
my ($factor) = ($sub=~/\(\(([_\.\d]+\&(:?[_\.\d]+\&)*)(?:[_\.\d]+\&*)+\)(?:\|\(\1(?:[_\.\d]+\&*)+\))+\)/); |
$sub=~s/$factor//g; |
next if (!defined($factor)); |
|
|
|
$sub=~s/\Q$factor\E//g; |
$sub=~s/^\(/\($factor\(/; |
$sub=~s/^\(/\($factor\(/; |
$sub.=')'; |
$sub.=')'; |
$sub=simplify($sub); |
$sub=simplify($sub); |
$orig=~s/(\W)/\\$1/g; |
$expr=~s/\Q$orig\E/$sub/; |
$expr=~s/$orig/$sub/; |
|
} |
} |
$hash{$key}=$expr; |
$hash{$key}=$expr; |
unless (defined($captured{$expr})) { |
unless (defined($captured{$expr})) { |
Line 456 sub accinit {
|
Line 462 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}.= |
Line 486 sub hiddenurls {
|
Line 492 sub hiddenurls {
|
my $mpc=$hash{'map_pc_'.$hash{'src_'.$rid}}; |
my $mpc=$hash{'map_pc_'.$hash{'src_'.$rid}}; |
# ------------------------------------------- put existing resources into array |
# ------------------------------------------- put existing resources into array |
my @currentrids=(); |
my @currentrids=(); |
foreach (sort(keys(%hash))) { |
foreach my $key (sort(keys(%hash))) { |
if ($_=~/^src_($mpc\.\d+)/) { |
if ($key=~/^src_($mpc\.\d+)/) { |
if ($hash{'src_'.$1}) { push @currentrids, $1; } |
if ($hash{'src_'.$1}) { push @currentrids, $1; } |
} |
} |
} |
} |
Line 539 sub hiddenurls {
|
Line 545 sub hiddenurls {
|
sub readmap { |
sub readmap { |
my $short=shift; |
my $short=shift; |
$short=~s/^\///; |
$short=~s/^\///; |
my %cenv=&Apache::lonnet::coursedescription($short); |
my %cenv=&Apache::lonnet::coursedescription($short,{'freshen_cache'=>1}); |
my $fn=$cenv{'fn'}; |
my $fn=$cenv{'fn'}; |
my $uri; |
my $uri; |
$short=~s/\//\_/g; |
$short=~s/\//\_/g; |
Line 585 sub readmap {
|
Line 591 sub readmap {
|
&hiddenurls(); |
&hiddenurls(); |
} |
} |
# ------------------------------------------------------- Put versions into src |
# ------------------------------------------------------- Put versions into src |
foreach (keys %hash) { |
foreach my $key (keys(%hash)) { |
if ($_=~/^src\_/) { |
if ($key=~/^src_/) { |
$hash{$_}=&putinversion($hash{$_}); |
$hash{$key}=&putinversion($hash{$key}); |
|
} elsif ($key =~ /^(map_(?:start|finish|pc)_)(.*)/) { |
|
my ($type, $url) = ($1,$2); |
|
my $value = $hash{$key}; |
|
$hash{$type.&putinversion($url)}=$value; |
} |
} |
} |
} |
# ---------------------------------------------------------------- Encrypt URLs |
# ---------------------------------------------------------------- Encrypt URLs |
foreach (keys %encurl) { |
foreach my $id (keys(%encurl)) { |
# $hash{'src_'.$_}=&Apache::lonenc::encrypted($hash{'src_'.$_}); |
# $hash{'src_'.$id}=&Apache::lonenc::encrypted($hash{'src_'.$id}); |
$hash{'encrypted_'.$_}=1; |
$hash{'encrypted_'.$id}=1; |
} |
} |
# ----------------------------------------------- Close hashes to finally store |
# ----------------------------------------------- Close hashes to finally store |
# --------------------------------- Routine must pass this point, no early outs |
# --------------------------------- Routine must pass this point, no early outs |