version 1.133, 2009/11/15 21:31:23
|
version 1.134, 2009/12/03 19:01:33
|
Line 62 my %hiddenurl; # this URL (or complete f
|
Line 62 my %hiddenurl; # this URL (or complete f
|
|
|
# ----------------------------------- Remove version from URL and store in hash |
# ----------------------------------- Remove version from URL and store in hash |
|
|
|
sub versionerror { |
|
my ($uri,$usedversion,$unusedversion)=@_; |
|
return '<br />'.&mt('Version discrepancy: resource [_1] included in both version [_2] and version [_3]. Using version [_2].', |
|
$uri,$usedversion,$unusedversion).'<br />'; |
|
} |
|
|
sub versiontrack { |
sub versiontrack { |
my $uri=shift; |
my $uri=shift; |
if ($uri=~/\.(\d+)\.\w+$/) { |
if ($uri=~/\.(\d+)\.\w+$/) { |
Line 69 sub versiontrack {
|
Line 75 sub versiontrack {
|
$uri=~s/\.\d+\.(\w+)$/\.$1/; |
$uri=~s/\.\d+\.(\w+)$/\.$1/; |
unless ($hash{'version_'.$uri}) { |
unless ($hash{'version_'.$uri}) { |
$hash{'version_'.$uri}=$version; |
$hash{'version_'.$uri}=$version; |
} |
} elsif ($version!=$hash{'version_'.$uri}) { |
|
$errtext.=&versionerror($uri,$hash{'version_'.$uri},$version); |
|
} |
} |
} |
return $uri; |
return $uri; |
} |
} |