--- loncom/homework/default_homework.lcpm	2005/07/13 20:44:29	1.101
+++ loncom/homework/default_homework.lcpm	2005/08/02 18:47:24	1.102
@@ -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.101 2005/07/13 20:44:29 albertel Exp $
+# $Id: default_homework.lcpm,v 1.102 2005/08/02 18:47:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -637,12 +637,12 @@ sub prettyprint {
 sub commaformat {
     my ($number,$target) = @_;
     if ($number =~ /\./) {
-	while ($number =~ /([^\.,]+)([^\.,][^\.,][^\.,])([,0-9]*\.[0-9]*)$/) {
-	    $number = $1.','.$2.$3;
+	while ($number =~ /([^0-9]*)([0-9]+)([^\.,][^\.,][^\.,])([,0-9]*\.[0-9]*)$/) {
+	    $number = $1.$2.','.$3.$4;
 	}
     } else {
-	while ($number =~ /([^,]+)([^,][^,][^,])([,0-9]*)$/) {
-	    $number = $1.','.$2.$3;
+	while ($number =~ /^([^0-9]*)([0-9]+)([^,][^,][^,])([,0-9]*)$/) {
+	    $number = $1.$2.','.$3.$4;
 	}
     }
     return $number;