version 1.7, 2012/12/08 20:10:32
|
version 1.10, 2013/05/30 04:02:02
|
Line 295 sub process_versions {
|
Line 295 sub process_versions {
|
# |
# |
sub versionerror { |
sub versionerror { |
my ($uri, $used, $unused) = @_; |
my ($uri, $used, $unused) = @_; |
my ($uri,$usedversion,$unusedversion)=@_; |
|
return '<br />'. |
return '<br />'. |
&mt('Version discrepancy: resource [_1] included in both version [_2] and version [_3]. Using version [_2].', |
&mt('Version discrepancy: resource [_1] included in both version [_2] and version [_3]. Using version [_2].', |
$uri,$used,$unused).'<br />'; |
$uri,$used,$unused).'<br />'; |
Line 1412 sub loadmap {
|
Line 1411 sub loadmap {
|
|
|
|
|
|
|
# Clear the auxillary hashes and the cond array. |
# Clear the auxiliary hashes and the cond array. |
|
|
|
|
%randompick = (); |
%randompick = (); |
Line 1426 sub loadmap {
|
Line 1425 sub loadmap {
|
$userdomain = ''; |
$userdomain = ''; |
%mapalias_cache = (); |
%mapalias_cache = (); |
%cenv = (); |
%cenv = (); |
|
$map_number = 0; |
|
|
|
|
# |
# |
|
|
$username = $uname; |
$username = $uname; |
Line 1446 sub loadmap {
|
Line 1445 sub loadmap {
|
{'freshen_cache' => 1, |
{'freshen_cache' => 1, |
'user' => $uname}); |
'user' => $uname}); |
|
|
unless ($cenv{'url'}) { |
unless ($cenv{'url'}) { |
&Apache::lonnet::logthis("lonmap::loadmap failed: $cnum/$cdom - did not get url"); |
&Apache::lonnet::logthis("lonmap::loadmap failed: $cnum/$cdom - did not get url"); |
return; |
return; |
} |
} |
Line 1532 sub loadmap {
|
Line 1531 sub loadmap {
|
|
|
|
|
&merge_hash($target_hash, 'randompick', \%randompick); |
&merge_hash($target_hash, 'randompick', \%randompick); |
&merge_hash($target_hash, 'randompickseed', \%randompick); |
&merge_hash($target_hash, 'randompickseed', \%randompickseed); |
&merge_hash($target_hash, 'randomorder', \%randomorder); |
&merge_hash($target_hash, 'randomorder', \%randomorder); |
&merge_hash($target_hash, 'encurl', \%encurl); |
&merge_hash($target_hash, 'encurl', \%encurl); |
&merge_hash($target_hash, 'hiddenurl', \%hiddenurl); |
&merge_hash($target_hash, 'hiddenurl', \%hiddenurl); |