[LON-CAPA-cvs] cvs: loncom /interface/spreadsheet assesscalc.pm

matthew lon-capa-cvs@mail.lon-capa.org
Tue, 03 Feb 2004 22:44:02 -0000


matthew		Tue Feb  3 17:44:02 2004 EDT

  Modified files:              
    /loncom/interface/spreadsheet	assesscalc.pm 
  Log:
  Fix: now specifies what a non number is instead of specifying what a number
  is.  Needs to go on all production servers if Guy has a chance to look it 
  over.  Also for 1.1.x.
  
  
Index: loncom/interface/spreadsheet/assesscalc.pm
diff -u loncom/interface/spreadsheet/assesscalc.pm:1.31 loncom/interface/spreadsheet/assesscalc.pm:1.32
--- loncom/interface/spreadsheet/assesscalc.pm:1.31	Tue Feb  3 17:19:47 2004
+++ loncom/interface/spreadsheet/assesscalc.pm	Tue Feb  3 17:44:02 2004
@@ -1,5 +1,5 @@
 #
-# $Id: assesscalc.pm,v 1.31 2004/02/03 22:19:47 matthew Exp $
+# $Id: assesscalc.pm,v 1.32 2004/02/03 22:44:02 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -784,7 +784,7 @@
         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);