--- loncom/interface/spreadsheet/assesscalc.pm	2005/05/17 18:01:58	1.48
+++ loncom/interface/spreadsheet/assesscalc.pm	2005/05/17 20:14:19	1.50
@@ -1,5 +1,5 @@
 #
-# $Id: assesscalc.pm,v 1.48 2005/05/17 18:01:58 albertel Exp $
+# $Id: assesscalc.pm,v 1.50 2005/05/17 20:14:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -786,9 +786,15 @@ sub compute {
         if ($parm =~ /_submission$/ && $value =~ /(\{|\})/) {
             $value = 'witheld';
         }
-        #$value = 'q{'.$value.'}' if ($value =~/([^\d\.]|\.\.)/);
+        $value = 'q{'.$value.'}' if ($value =~/([^\d\.]|\.\.)/);
         $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->constants(\%c);
     $self->calcsheet();
@@ -837,7 +843,7 @@ sub sett {
 		&& $self->{'constants'}->{$formula} ne ''
 		) {
 		$Apache::Spreadsheet::sheet_values{$cell}=
-		    $self->{'constants'}->{$formula};
+		    eval($self->{'constants'}->{$formula});
             }
         } else {
             $t{$cell}=$formula;