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

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 17 May 2005 18:04:40 -0000


albertel		Tue May 17 14:04:40 2005 EDT

  Modified files:              
    /loncom/interface/spreadsheet	assesscalc.pm 
  Log:
  - didn't mean to commit that, it makes things faster, but likely can cause problems
  
  
Index: loncom/interface/spreadsheet/assesscalc.pm
diff -u loncom/interface/spreadsheet/assesscalc.pm:1.48 loncom/interface/spreadsheet/assesscalc.pm:1.49
--- loncom/interface/spreadsheet/assesscalc.pm:1.48	Tue May 17 14:01:58 2005
+++ loncom/interface/spreadsheet/assesscalc.pm	Tue May 17 14:04:40 2005
@@ -1,5 +1,5 @@
 #
-# $Id: assesscalc.pm,v 1.48 2005/05/17 18:01:58 albertel Exp $
+# $Id: assesscalc.pm,v 1.49 2005/05/17 18:04:40 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -786,7 +786,7 @@
         if ($parm =~ /_submission$/ && $value =~ /(\{|\})/) {
             $value = 'witheld';
         }
-        #$value = 'q{'.$value.'}' if ($value =~/([^\d\.]|\.\.)/);
+        $value = 'q{'.$value.'}' if ($value =~/([^\d\.]|\.\.)/);
         $c{$parm} = $value;
     }
     $self->formulas(\%f);
@@ -837,7 +837,7 @@
 		&& $self->{'constants'}->{$formula} ne ''
 		) {
 		$Apache::Spreadsheet::sheet_values{$cell}=
-		    $self->{'constants'}->{$formula};
+		    eval($self->{'constants'}->{$formula});
             }
         } else {
             $t{$cell}=$formula;