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

[www]

www		Wed Mar  5 21:20:05 2008 EDT

  Modified files:              
    /loncom/homework	default_homework.lcpm 
  Log:
  Let's hope for the best.
  
  
Index: loncom/homework/default_homework.lcpm
diff -u loncom/homework/default_homework.lcpm:1.130 loncom/homework/default_homework.lcpm:1.131
--- loncom/homework/default_homework.lcpm:1.130	Wed Mar  5 20:54:16 2008
+++ loncom/homework/default_homework.lcpm	Wed Mar  5 21:20:05 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.130 2008/03/06 01:54:16 www Exp $
+# $Id: default_homework.lcpm,v 1.131 2008/03/06 02:20:05 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -311,7 +311,7 @@
     if ($type eq '' || $type eq 'float') {
 	#for numerical problems split off the unit
 #	if ( $responses->[0][-1]=~ /(.*[^\s])\s+([^\s]+)/ ) {
-        if ( $responses->[0][-1]=~ /^([\d\.\,\s\$]*(?:(?:[xX\*]10[\^\*]*|[eE]*)[\+\-]*\d*)*(?:^|\S)\d+)([\$\s\w\^\*\/\(\)\+\-]*\D[\$\s\w\^\*\/\(\)\+\-]*)$/ ) {
+        if ( $responses->[0][-1]=~ /^([\d\.\,\s\$]*(?:(?:[xX\*]10[\^\*]*|[eE]*)[\+\-]*\d*)*(?:^|\S)\d+)([\$\s\w\^\*\/\(\)\+\-]*[^\d\.][\$\s\w\^\*\/\(\)\+\-]*)$/ ) {
 	    $responses->[0][-1]=$1;
 	    $unit=&capa_formula_fix($2);
             &LONCAPA_INTERNAL_DEBUG("Found unit :$unit:");