version 1.120, 2007/08/28 01:06:15
|
version 1.121, 2007/08/28 01:09:14
|
Line 293 sub loadmap {
|
Line 293 sub loadmap {
|
} else { |
} else { |
$hash{'param_'.$referid}=''.$newparam; |
$hash{'param_'.$referid}=''.$newparam; |
} |
} |
if ($token->[2]->{'name'}=~/^parameter_(0_)*mapalias$/) { |
|
$hash{'mapalias_'.$token->[2]->{'value'}}=$referid; |
|
} |
|
if ($token->[2]->{'name'}=~/^parameter_(0_)*randompick$/) { |
if ($token->[2]->{'name'}=~/^parameter_(0_)*randompick$/) { |
$randompick{$referid}=$token->[2]->{'value'}; |
$randompick{$referid}=$token->[2]->{'value'}; |
} |
} |
Line 320 sub loadmap {
|
Line 317 sub loadmap {
|
} else { |
} else { |
$errtext.=&mt('<br />Map not loaded: The file <tt>[_1]</tt> does not exist.',$fn); |
$errtext.=&mt('<br />Map not loaded: The file <tt>[_1]</tt> does not exist.',$fn); |
} |
} |
|
|
|
my $parser = HTML::TokeParser->new(\$instr); |
|
$parser->attr_encoded(1); |
|
# last parse out the mapalias params so as to ignore anything |
|
# refering to non-existant resources |
|
while (my $token = $parser->get_token) { |
|
next if ($token->[0] ne 'S'); |
|
if ($token->[1] eq 'param') { |
|
&parse_mapalias_param($token,$lpc); |
|
} |
|
} |
|
} |
|
|
|
sub parse_mapalias_param { |
|
my ($token,$lpc) = @_; |
|
my $referid=$lpc.'.'.$token->[2]->{'to'}; |
|
return if (!exists($hash{'src_'.$referid})); |
|
|
|
if ($token->[2]->{'name'}=~/^parameter_(0_)*mapalias$/) { |
|
$hash{'mapalias_'.$token->[2]->{'value'}}=$referid; |
|
} |
} |
} |
|
|
# --------------------------------------------------------- Simplify expression |
# --------------------------------------------------------- Simplify expression |