loncom/interface/spreadsheet/assesscalc.pm - diff

Return to assesscalc.pm CVS log

Up to [LON-CAPA] / loncom / interface / spreadsheet

version 1.49, 2005/05/17 18:04:40	version 1.51, 2005/10/12 21:29:49
Line 703 sub parameter_part_is_valid {	Line 703 sub parameter_part_is_valid {
return 1;	return 1;
}	}
#	#
my (undef,$part) =	my ($start,@pieces)=split('_',$parameter);
($parameter =~ m/^(resource\|stores\|parameter)_([^_]+)_.*/);	if ( $start !~ m/^(resource\|stores\|parameter)$/) { return 0; }
if (exists($self->{'Parts'}) &&	while (@pieces) {
exists($self->{'Parts'}->{$part}) &&	pop(@pieces);
$self->{'Parts'}->{$part} ) {	my $testpart=join('_',@pieces);
return 1;	if (exists($self->{'Parts'}->{$testpart}) &&
} else {	$self->{'Parts'}->{$testpart} ) {
return 0;	return 1;
	}
}	}
	return 0;
}	}

sub compute {	sub compute {
Line 789 sub compute {	Line 791 sub compute {
$value = 'q{'.$value.'}' if ($value =~/([^\d\.]\|\.\.)/);	$value = 'q{'.$value.'}' if ($value =~/([^\d\.]\|\.\.)/);
$c{$parm} = $value;	$c{$parm} = $value;
}	}
	foreach my $cell (grep(/^A/,keys(%f))) {
	# Clean out any bad formulas
	next if (exists($c{$f{$cell}}));
	next if ($cell eq 'A0');
	delete($f{$cell});
	}
$self->formulas(\%f);	$self->formulas(\%f);
$self->constants(\%c);	$self->constants(\%c);
$self->calcsheet();	$self->calcsheet();