version 1.121, 2007/08/28 01:09:14
|
version 1.122, 2007/08/28 01:13:19
|
Line 336 sub parse_mapalias_param {
|
Line 336 sub parse_mapalias_param {
|
return if (!exists($hash{'src_'.$referid})); |
return if (!exists($hash{'src_'.$referid})); |
|
|
if ($token->[2]->{'name'}=~/^parameter_(0_)*mapalias$/) { |
if ($token->[2]->{'name'}=~/^parameter_(0_)*mapalias$/) { |
|
&count_mapalias($token->[2]->{'value'},$referid); |
$hash{'mapalias_'.$token->[2]->{'value'}}=$referid; |
$hash{'mapalias_'.$token->[2]->{'value'}}=$referid; |
} |
} |
} |
} |
Line 599 sub readmap {
|
Line 600 sub readmap {
|
%parmhash=(); |
%parmhash=(); |
$errtext=''; |
$errtext=''; |
$pc=0; |
$pc=0; |
|
&clear_mapalias_count(); |
&processversionfile(%cenv); |
&processversionfile(%cenv); |
my $furi=&Apache::lonnet::clutter($uri); |
my $furi=&Apache::lonnet::clutter($uri); |
$hash{'src_0.0'}=&versiontrack($furi); |
$hash{'src_0.0'}=&versiontrack($furi); |
Line 615 sub readmap {
|
Line 617 sub readmap {
|
&accinit($uri,$short,$fn); |
&accinit($uri,$short,$fn); |
&hiddenurls(); |
&hiddenurls(); |
} |
} |
|
$errtext .= &get_mapalias_errors(); |
# ------------------------------------------------------- Put versions into src |
# ------------------------------------------------------- Put versions into src |
foreach my $key (keys(%hash)) { |
foreach my $key (keys(%hash)) { |
if ($key=~/^src_/) { |
if ($key=~/^src_/) { |
Line 746 sub evalstate {
|
Line 749 sub evalstate {
|
return $state; |
return $state; |
} |
} |
|
|
|
{ |
|
my %mapalias_cache; |
|
sub count_mapalias { |
|
my ($value,$resid) = @_; |
|
push(@{ $mapalias_cache{$value} }, $resid); |
|
} |
|
|
|
sub get_mapalias_errors { |
|
my $error_text; |
|
foreach my $mapalias (sort(keys(%mapalias_cache))) { |
|
next if (scalar(@{ $mapalias_cache{$mapalias} } ) == 1); |
|
my $count; |
|
my $which = |
|
join('</li><li>', |
|
map { |
|
my $id = $_; |
|
if (exists($hash{'src_'.$id})) { |
|
$count++; |
|
} |
|
my ($mapid) = split(/\./,$id); |
|
&mt('[_1] in [_2]', $hash{'title_'.$id}, |
|
|
|
$hash{'title_'.$hash{'ids_'.$hash{'map_id_'.$mapid}}}); |
|
} (@{ $mapalias_cache{$mapalias} })); |
|
next if ($count < 2); |
|
$error_text .= '<div class="LC_error">'. |
|
&mt('Error: Found the mapalias "[_1]" defined multiple times.', |
|
$mapalias). |
|
'</div><ul><li>'.$which.'</li></ul>'; |
|
} |
|
&clear_mapalias_count(); |
|
return $error_text; |
|
} |
|
sub clear_mapalias_count { |
|
undef(%mapalias_cache); |
|
} |
|
} |
1; |
1; |
__END__ |
__END__ |
|
|