version 1.75, 2004/04/23 19:39:25
|
version 1.77, 2004/04/26 19:16:45
|
Line 160 sub loadmap {
|
Line 160 sub loadmap {
|
if ($token->[2]->{'external'} eq 'true') { # external |
if ($token->[2]->{'external'} eq 'true') { # external |
$turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//; |
$turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//; |
} elsif ($turi=~/^\/*uploaded\//) { # uploaded |
} elsif ($turi=~/^\/*uploaded\//) { # uploaded |
if (($embstyle eq 'img') || ($embstyle eq 'emb') |
if (($embstyle eq 'img') || ($embstyle eq 'emb')) { |
|| ($embstyle eq 'ssi')) { |
$turi='/adm/wrapper'.$turi; |
unless ($turi =~/\.page$/) { |
|
$turi='/adm/wrapper'.$turi; |
|
} |
|
} elsif ($turi!~/\.(sequence|page)$/) { |
} elsif ($turi!~/\.(sequence|page)$/) { |
$turi='/adm/coursedocs/showdoc'.$turi; |
$turi='/adm/coursedocs/showdoc'.$turi; |
} |
} |
Line 332 sub simplify {
|
Line 329 sub simplify {
|
# -------------------------------------------------------- Build condition hash |
# -------------------------------------------------------- Build condition hash |
|
|
sub traceroute { |
sub traceroute { |
my ($sofar,$rid,$beenhere)=@_; |
my ($sofar,$rid,$beenhere,$encflag,$hdnflag)=@_; |
$sofar=simplify($sofar); |
$sofar=simplify($sofar); |
unless ($beenhere=~/\&$rid\&/) { |
unless ($beenhere=~/\&$rid\&/) { |
$beenhere.=$rid.'&'; |
$beenhere.=$rid.'&'; |
|
if ($hdnflag) { |
|
$hiddenurl{$rid}=1; |
|
} |
|
if ($encflag) { |
|
$encurl{$rid}=1; |
|
} |
if (($retfurl eq '') && ($hash{'src_'.$rid}) |
if (($retfurl eq '') && ($hash{'src_'.$rid}) |
&& ($hash{'src_'.$rid}!~/\.sequence$/)) { |
&& ($hash{'src_'.$rid}!~/\.sequence$/)) { |
my ($mapid,$resid)=split(/\./,$rid); |
my ($mapid,$resid)=split(/\./,$rid); |
Line 354 sub traceroute {
|
Line 357 sub traceroute {
|
} |
} |
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}})) { |
&traceroute($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},'&'); |
&traceroute($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},'&', |
|
$encflag || $encurl{$rid}, |
|
$hdnflag || $hiddenurl{$rid}); |
if (defined($hash{'map_finish_'.$hash{'src_'.$rid}})) { |
if (defined($hash{'map_finish_'.$hash{'src_'.$rid}})) { |
$sofar= |
$sofar= |
$hash{'conditions_'.$hash{'map_finish_'.$hash{'src_'.$rid}}}; |
$hash{'conditions_'.$hash{'map_finish_'.$hash{'src_'.$rid}}}; |
Line 373 sub traceroute {
|
Line 378 sub traceroute {
|
.$hash{'undercond_'.$_}.'. '; |
.$hash{'undercond_'.$_}.'. '; |
} |
} |
} |
} |
&traceroute($further,$hash{'goesto_'.$_},$beenhere); |
&traceroute($further,$hash{'goesto_'.$_},$beenhere,$encflag,$hdnflag); |
} |
} |
} |
} |
} |
} |