loncom/interface/lonnavmaps.pm - diff

Return to lonnavmaps.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonnavmaps.pm between versions 1.410 and 1.412

version 1.410, 2008/01/20 01:52:47	version 1.412, 2008/02/03 00:05:23
Line 854 sub render_resource {	Line 854 sub render_resource {
if (!$resource->condval()) {	if (!$resource->condval()) {
$nonLinkedText .= ' <i>('.&mt('conditionally hidden').')</i> ';	$nonLinkedText .= ' <i>('.&mt('conditionally hidden').')</i> ';
}	}
	if ($resource->is_practice()) {
	$nonLinkedText .=' <font color="green"><b>'.&mt('not graded').'</b></font>';
	}

# We're done preparing and finally ready to start the rendering	# We're done preparing and finally ready to start the rendering
my $result = "<td align='left' valign='middle'>";	my $result = "<td align='left' valign='middle'>";

Line 2299 sub parmval {	Line 2302 sub parmval {
my $hashkey = $what."\|\|\|".$symb;	my $hashkey = $what."\|\|\|".$symb;

if (defined($self->{PARM_CACHE}->{$hashkey})) {	if (defined($self->{PARM_CACHE}->{$hashkey})) {
if (wantarray) {	if (ref($self->{PARM_CACHE}->{$hashkey}) eq 'ARRAY') {
return @{$self->{PARM_CACHE}->{$hashkey}};	if (defined($self->{PARM_CACHE}->{$hashkey}->[0])) {
} else {	if (wantarray) {
return $self->{PARM_CACHE}->{$hashkey}->[0];	return @{$self->{PARM_CACHE}->{$hashkey}};
}	} else {
	return $self->{PARM_CACHE}->{$hashkey}->[0];
	}
	}
	} else {
	return $self->{PARM_CACHE}->{$hashkey};
	}
}	}

my $result = $self->parmval_real($what, $symb, $recurse);	my $result = $self->parmval_real($what, $symb, $recurse);
$self->{PARM_CACHE}->{$hashkey} = $result;	$self->{PARM_CACHE}->{$hashkey} = $result;
if (wantarray) {	if (wantarray) {
return @{$result};	return @{$result};
}	}
return $result->[0];	return $result->[0];
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.410
changed lines
	Added in v.1.412