loncom/interface/lonspreadsheet.pm - diff

Return to lonspreadsheet.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.173, 2003/03/03 22:00:03	version 1.174, 2003/03/07 04:20:20
Line 722 sub parmval {	Line 722 sub parmval {
# second, check map parms	# second, check map parms
my $thisparm = $parmhash{$symbparm};	my $thisparm = $parmhash{$symbparm};
return $thisparm if (defined($thisparm));	return $thisparm if (defined($thisparm));

# first, check default	# first, check default
return &Apache::lonnet::metadata($fn,$rwhat.'.default');	$thisparm = &Apache::lonnet::metadata($fn,$rwhat.'.default');
	return $thisparm if (defined($thisparm));

	#Cascade Up
	my $space=$what;
	$space=~s/\.\w+$//;
	if ($space ne '0') {
	my @parts=split(/_/,$space);
	my $id=pop(@parts);
	my $part=join('_',@parts);
	if ($part eq '') { $part='0'; }
	my $newwhat=$rwhat;
	$newwhat=~s/\Q$space\E/$part/;
	my $partgeneral=&parmval($newwhat,$symb,$uname,$udom,$csec);
	if (defined($partgeneral)) { return $partgeneral; }
	}

	#nothing defined
	return '';
}	}

#	#
Line 1507 sub expandnamed {	Line 1526 sub expandnamed {
foreach my $varname ( @vars ) {	foreach my $varname ( @vars ) {
if ($varname=~/\D/) {	if ($varname=~/\D/) {
$formula=~s/$varname/'$c{\''.$varname.'\'}'/ge;	$formula=~s/$varname/'$c{\''.$varname.'\'}'/ge;
$varname=~s/$var/$\\w\+$/g;	$varname=~s/$var/$[\\w:-]\+$/g;
foreach (keys(%{$self->{'constants'}})) {	foreach (keys(%{$self->{'constants'}})) {
if ($_=~/$varname/) {	if ($_=~/$varname/) {
$values{$1}=1;	$values{$1}=1;