--- loncom/interface/spreadsheet/assesscalc.pm	2005/05/15 02:40:26	1.44
+++ loncom/interface/spreadsheet/assesscalc.pm	2005/05/15 03:45:42	1.47
@@ -1,5 +1,5 @@
 #
-# $Id: assesscalc.pm,v 1.44 2005/05/15 02:40:26 albertel Exp $
+# $Id: assesscalc.pm,v 1.47 2005/05/15 03:45:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -632,7 +632,10 @@ sub get_parameter_values {
             $self->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) {
 	my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($self->{'symb'});
         foreach my $parmname (@Parameters) {
-            my $value = $self->parmval($parmname,$self->{'name'},$self->{'domain'},$self->{'section'},$self->{'symb'},undef,$mapname,$id,$fn);
+            my $value = $self->parmval($parmname,$self->{'symb'},
+				       $self->{'name'},$self->{'domain'},
+				       $self->{'section'},undef,
+				       $mapname,$id,$fn);
             $parameters{$parmname} =$value;
         }
         untie(%parmhash);
@@ -833,7 +836,10 @@ sub sett {
     while (my ($cell,$formula) = each(%{$self->{'formulas'}})) {
 	next if ($cell =~ /template_/);
         if ($cell =~ /^A/ && $cell ne 'A0') {
-            if ($formula !~ /^\!/) {
+	    if ($formula !~ /^\!/ 
+		&& exists($self->{'constants'}->{$formula}) 
+		&& $self->{'constants'}->{$formula} ne ''
+		) {
 		$Apache::Spreadsheet::sheet_values{$cell}=
 		    eval($self->{'constants'}->{$formula});
             }