--- loncom/homework/default_homework.lcpm	2004/10/11 16:31:34	1.90
+++ loncom/homework/default_homework.lcpm	2004/10/21 02:43:34	1.91
@@ -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.90 2004/10/11 16:31:34 albertel Exp $
+# $Id: default_homework.lcpm,v 1.91 2004/10/21 02:43:34 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,32 @@ $rad2deg=180.0/$pi;
 $deg2rad=$pi/180.0;
 $"=' ';
 
+sub check_commas {
+    my ($response)=@_;
+    #print("$response ");
+    my @numbers=split(',',$response);
+    #print(" numbers ".join('-',@numbers)." ");
+    if (scalar(@numbers) > 1) {
+        #print(" numbers[0] ".$numbers[0]." "); 
+	if (length($numbers[0]) > 3 || length($numbers[0]) == 0) { return -1; }
+	shift(@numbers);
+	#print(" numbers ".scalar(@numbers)." ");
+	while (scalar(@numbers) > 1) {
+	    #print(" numbers ".join('-',@numbers)." ");
+	    if (length($numbers[0]) != 3) { return -2; }
+	    shift(@numbers);
+	}
+	my ($number)=split('\.',$numbers[0]);
+	#print(" number ".$number." ");
+	#print(" numbers[0] ".$numbers[0]." ");
+	if (length($number) != 3) { return -3; }
+    } else {
+	my ($number)=split('\.',$numbers[0]);
+	if (length($number) > 3) { return -4; }
+    }
+    return 1;
+}
+
 sub caparesponse_check {
     my ($answer,$response)=@_;
     #not properly used yet: calc
@@ -69,12 +95,16 @@ sub caparesponse_check {
 	$answer=~s/ +/ /g;
 	$response=~s/ +/ /g;
     }
-    if ($type eq 'float') { $response=~s/,//g; }
-    if ($type eq 'float' && $ans_fmt=~/\$/) {
+    if ($type eq 'float' && $unit=~/\$/) {
 	if ($response!~/^\$/)  { return "NO_UNIT: Missing \$ "; }
 	$response=~s/\$//g;
     }
+    if ($type eq 'float' && $unit=~/\,/ && (&check_commas($response)<0)) {
+	return "COMMA_FAIL:";
+    }
     $ans_fmt=~s/\W//g;
+    $unit=~s/[\$,]//g;
+    if ($type eq 'float') { $response=~s/,//g; }
 
     if (length($response) > 500) { return "TOO_LONG: Answer too long"; }