version 1.119.2.1, 2007/10/29 18:51:00
|
version 1.121, 2007/08/28 01:09:14
|
Line 108 sub processversionfile {
|
Line 108 sub processversionfile {
|
sub loadmap { |
sub loadmap { |
my $uri=shift; |
my $uri=shift; |
if ($hash{'map_pc_'.$uri}) { |
if ($hash{'map_pc_'.$uri}) { |
$errtext.=&mt('<br />Multiple use of sequence/page <tt>[_1]</tt>! The course will not function properly.',$uri); |
$errtext.='<p class="LC_error">'. |
|
&mt('Multiple use of sequence/page [_1]! The course will not function properly.','<tt>'.$uri.'</tt>'). |
|
'</p>'; |
return; |
return; |
} |
} |
$pc++; |
$pc++; |
Line 234 sub loadmap {
|
Line 236 sub loadmap {
|
my $rid=$lpc.'.'.$token->[2]->{'id'}; |
my $rid=$lpc.'.'.$token->[2]->{'id'}; |
|
|
$hash{'kind_'.$rid}='cond'; |
$hash{'kind_'.$rid}='cond'; |
my $condition = $token->[2]->{'value'}; |
$cond[$#cond+1]=$token->[2]->{'value'}; |
$condition =~ s/[\n\r]+/ /gs; |
|
push(@cond, $condition); |
|
$hash{'condid_'.$rid}=$#cond; |
$hash{'condid_'.$rid}=$#cond; |
if ($token->[2]->{'type'}) { |
if ($token->[2]->{'type'}) { |
$cond[$#cond].=':'.$token->[2]->{'type'}; |
$cond[$#cond].=':'.$token->[2]->{'type'}; |
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 |
Line 350 sub simplify {
|
Line 368 sub simplify {
|
sub traceroute { |
sub traceroute { |
my ($sofar,$rid,$beenhere,$encflag,$hdnflag)=@_; |
my ($sofar,$rid,$beenhere,$encflag,$hdnflag)=@_; |
my $newsofar=$sofar=simplify($sofar); |
my $newsofar=$sofar=simplify($sofar); |
unless ($beenhere=~/\&$rid\&/) { |
unless ($beenhere=~/\&\Q$rid\E\&/) { |
$beenhere.=$rid.'&'; |
$beenhere.=$rid.'&'; |
my ($mapid,$resid)=split(/\./,$rid); |
my ($mapid,$resid)=split(/\./,$rid); |
my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid}); |
my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid}); |