version 1.98, 2005/11/15 18:27:52
|
version 1.99.2.1, 2006/02/23 08:38:54
|
Line 166 sub loadmap {
|
Line 166 sub loadmap {
|
} elsif ($turi=~/^\/*uploaded\//) { # uploaded |
} elsif ($turi=~/^\/*uploaded\//) { # uploaded |
if (($embstyle eq 'img') |
if (($embstyle eq 'img') |
|| ($embstyle eq 'emb') |
|| ($embstyle eq 'emb') |
|| ($embstyle eq 'ign') |
|| ($embstyle eq 'wrp')) { |
|| ($embstyle eq 'unk')) { |
|
$turi='/adm/wrapper'.$turi; |
$turi='/adm/wrapper'.$turi; |
} elsif ($embstyle eq 'ssi') { |
} elsif ($embstyle eq 'ssi') { |
#do nothing with these |
#do nothing with these |
Line 178 sub loadmap {
|
Line 177 sub loadmap {
|
my $mapdir=$uri; |
my $mapdir=$uri; |
$mapdir=~s/[^\/]+$//; |
$mapdir=~s/[^\/]+$//; |
$turi=&Apache::lonnet::hreflocation($mapdir,$turi); |
$turi=&Apache::lonnet::hreflocation($mapdir,$turi); |
if (($embstyle eq 'img') || ($embstyle eq 'emb')) { |
if (($embstyle eq 'img') |
|
|| ($embstyle eq 'emb') |
|
|| ($embstyle eq 'wrp')) { |
$turi='/adm/wrapper'.$turi; |
$turi='/adm/wrapper'.$turi; |
} |
} |
} |
} |
Line 317 sub loadmap {
|
Line 318 sub loadmap {
|
|
|
sub simplify { |
sub simplify { |
my $expression=shift; |
my $expression=shift; |
|
# (0&1) = 1 |
|
$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 |
Line 326 sub simplify {
|
Line 329 sub simplify {
|
# (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; |