--- loncom/homework/default_homework.lcpm	2011/06/08 20:38:47	1.158
+++ loncom/homework/default_homework.lcpm	2011/06/09 15:43:56	1.159
@@ -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.158 2011/06/08 20:38:47 www Exp $
+# $Id: default_homework.lcpm,v 1.159 2011/06/09 15:43:56 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -143,7 +143,6 @@ sub caparesponse_check {
     my $sig_lbound=''; #done
     my $sig_ubound=''; #done
 
-
     #type's definitons come from capaParser.h
 
     #remove leading and trailing whitespace
@@ -152,10 +151,8 @@ sub caparesponse_check {
     }
     if ($response=~ /^\s|\s$/) {
 	$response=~ s:^\s+|\s+$::g;
-	&LONCAPA_INTERNAL_DEBUG("Removed ws now :$response:");
     }
 
-    #&LONCAPA_INTERNAL_DEBUG(" type is $type ");
     if ($type eq 'cs' || $type eq 'ci') {
 	#for string answers make sure all places spaces occur, there is 
         #really only 1 space, in both the answer and the response
@@ -179,7 +176,6 @@ sub caparesponse_check {
     if (length($response) > 500) { return ('TOO_LONG',undef); }
 
     if ($type eq '' ) {
-	&LONCAPA_INTERNAL_DEBUG("Didn't find a type :$type: defaulting");
 	if ( $answer eq ($answer *1.0)) { $type = 2;
 				      } else { $type = 3; }
     } else {
@@ -199,7 +195,6 @@ sub caparesponse_check {
     #formula type setup the sample points
     if ($type eq '8') {
 	($id_list,$points)=split(/@/,$samples);
-	&LONCAPA_INTERNAL_DEBUG("Found :$id_list:$points: points in $samples");
     }
     if ($tol eq '') {
 	$tol=0.0;
@@ -258,8 +253,6 @@ sub caparesponse_check {
     elsif ($result =='15') { $result='UNIT_IRRECONCIBLE'; }
     else  {$result = "ERROR: Unknown Result:$result:$@:";}
 
-    &LONCAPA_INTERNAL_DEBUG("RetError $reterror: Answer $answer: Response $response:  type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|");
-    &LONCAPA_INTERNAL_DEBUG(" $answer $response $result ");
     return ($result,$reterror);
 }
 
@@ -310,9 +303,8 @@ sub caparesponse_check_list {
 	}
     }
 
-    &LONCAPA_INTERNAL_DEBUG("Initial final response :$responses->[0][-1]:");
     my $unit;
-    my ($allowalgebra)=(&parameter_setting('allowalgebra',&currentpart())=~/^(yes|1|on)$/i);
+    my ($allowalgebra)=($LONCAPA::CAPAresponse_args{'allowalgebra'}=~/^(yes|1|on)$/i);
     if ($type eq 'float' || $type eq '') {
 	#for numerical problems split off the unit
         my $part1;
@@ -325,10 +317,16 @@ sub caparesponse_check_list {
         if (defined($part1) && defined($part2)) {
 	    $responses->[0][-1]=$part1;
 	    $unit=&capa_formula_fix($part2);
-            &LONCAPA_INTERNAL_DEBUG("Found unit :$unit:");
+            my $customunits=$LONCAPA::CAPAresponse_args{'customunits'};
+            foreach my $replacement (split(/\s*\,\s*/,$customunits)) {
+                my ($which,$what)=split(/\s*\=\s*/,$replacement);
+                if ((defined($which)) && (defined($what))) {
+                   $what=&capa_formula_fix($what);
+                   $unit=~s/$which/\($what\)/g;
+                }
+            }
 	}
     }
-    &LONCAPA_INTERNAL_DEBUG("Final final response :$responses->[0][-1]:$unit:");
     $unit=~s/\s//;
     my $error;
     foreach my $response (@$responses) {
@@ -414,14 +412,12 @@ sub caparesponse_check_list {
                         }  
                     }
                 }
-                # See if we have preprocessor
-                &LONCAPA_INTERNAL_DEBUG("Ordered preprocessor $preprocess");
-                if ($preprocess=~/\S/) {
+                # See if we have preprocessor for string responses
+                if (($preprocess=~/\S/) && ($type eq 'cs' || $type eq 'ci'))  {
                     if (defined(&$preprocess)) {
                         no strict 'refs';
                         $response->[$j]=&$preprocess($response->[$j]);
                         use strict 'refs';
-                        &LONCAPA_INTERNAL_DEBUG("Ordered processed: $response->[$j]");
                     }
                 }
 
@@ -464,13 +460,11 @@ sub caparesponse_check_list {
                             }
                         }
                         # See if we have preprocessor
-                        &LONCAPA_INTERNAL_DEBUG("Unordered preprocessor $preprocess");
-                        if ($preprocess=~/\S/) {
+                        if (($preprocess=~/\S/) && ($type eq 'cs' || $type eq 'ci')) {
                             if (defined(&$preprocess)) {
                                 no strict 'refs';
                                 $response->[$j]=&$preprocess($response->[$j]);
                                 use strict 'refs';
-                                &LONCAPA_INTERNAL_DEBUG("Unordered processed: $response->[$j]");
                             }
                         }