loncom/lonmap.pm - diff

Return to lonmap.pm CVS log

Up to [LON-CAPA] / loncom

version 1.7, 2012/12/08 20:10:32	version 1.9, 2013/01/03 20:32:40
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 = ();