--- loncom/lonmap.pm 2012/12/20 16:10:57 1.8 +++ loncom/lonmap.pm 2013/05/30 04:02:02 1.10 @@ -2,7 +2,7 @@ # # Read maps into a 'big hash'. # -# $Id: lonmap.pm,v 1.8 2012/12/20 16:10:57 raeburn Exp $ +# $Id: lonmap.pm,v 1.10 2013/05/30 04:02:02 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -295,7 +295,6 @@ sub process_versions { # sub versionerror { my ($uri, $used, $unused) = @_; - my ($uri,$usedversion,$unusedversion)=@_; return '
'. &mt('Version discrepancy: resource [_1] included in both version [_2] and version [_3]. Using version [_2].', $uri,$used,$unused).'
'; @@ -1426,8 +1425,8 @@ sub loadmap { $userdomain = ''; %mapalias_cache = (); %cenv = (); + $map_number = 0; - # $username = $uname; @@ -1446,7 +1445,7 @@ sub loadmap { {'freshen_cache' => 1, 'user' => $uname}); - unless ($cenv{'url'}) { + unless ($cenv{'url'}) { &Apache::lonnet::logthis("lonmap::loadmap failed: $cnum/$cdom - did not get url"); return; } @@ -1532,7 +1531,7 @@ sub loadmap { &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, 'encurl', \%encurl); &merge_hash($target_hash, 'hiddenurl', \%hiddenurl);