[LON-CAPA-cvs] cvs: loncom /homework default_homework.lcpm

[raeburn]

raeburn		Wed Nov 26 18:11:52 2008 EDT

  Modified files:              
    /loncom/homework	default_homework.lcpm 
  Log:
  Formularesponse will not accept a comma in an individual submission  - either as a scalar answer or within a single component in a vector answer (for vectors: components are split on , prior to this evaluation phase).
  
  
Index: loncom/homework/default_homework.lcpm
diff -u loncom/homework/default_homework.lcpm:1.141 loncom/homework/default_homework.lcpm:1.142
--- loncom/homework/default_homework.lcpm:1.141	Sat Sep 27 07:26:45 2008
+++ loncom/homework/default_homework.lcpm	Wed Nov 26 18:11:52 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run()
 #
-# $Id: default_homework.lcpm,v 1.141 2008/09/27 07:26:45 raeburn Exp $
+# $Id: default_homework.lcpm,v 1.142 2008/11/26 18:11:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -217,7 +217,13 @@
 
     my $reterror="";
     my $result;
-    if ((($type eq '9') || ($type eq '8')) && ($response=~/\=/)) { return ('BAD_FORMULA','Please submit just an expression, not an equation.'); }
+    if (($type eq '9') || ($type eq '8')) {
+        if ($response=~/\=/) {
+            return ('BAD_FORMULA','Please submit just an expression, not an equation.');
+        } elsif ($response =~ /\,/) {
+            return ('BAD_FORMULA');
+        }
+    }
     if ($type eq '9') {
       $result = &maxima_check(&maxima_cas_formula_fix($response),&maxima_cas_formula_fix($answer),\$reterror);
     } else {