--- loncom/interface/spreadsheet/assesscalc.pm	2004/02/03 22:19:47	1.31
+++ loncom/interface/spreadsheet/assesscalc.pm	2004/02/24 20:47:14	1.33
@@ -1,5 +1,5 @@
 #
-# $Id: assesscalc.pm,v 1.31 2004/02/03 22:19:47 matthew Exp $
+# $Id: assesscalc.pm,v 1.33 2004/02/24 20:47:14 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -784,7 +784,7 @@ sub compute {
         if ($parm =~ /_submission$/ && $value =~ /(\{|\})/) {
             $value = 'witheld';
         }
-        $value = 'q{'.$value.'}' if ($value !~/^\s*\d+(\.\d+)?\s*$/);
+        $value = 'q{'.$value.'}' if ($value =~/([^\d\.]|\.\.)/);
         $c{$parm} = $value;
     }
     $self->formulas(\%f);
@@ -876,6 +876,10 @@ sub load_cached_export_rows {
         # We only got one key, so we will access it directly.
         while (my ($key,$sheetdata) = each(%tmp)) {
             my ($sname,$sdom,$sheettype,$symb) = split(':',$key);
+            if (! defined($sname) || $sname eq '' ||
+                ! defined($sdom)  || $sdom eq '' ) {
+                next;
+            }
             if ($symb =~ /\.time$/) {
                 $symb =~ s/\.time$//;
                 $Exportrows{$symb}->{'time'} = $sheetdata;