--- loncom/homework/default_homework.lcpm	2009/06/23 03:01:15	1.145
+++ loncom/homework/default_homework.lcpm	2010/10/14 19:54:56	1.149
@@ -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.145 2009/06/23 03:01:15 www Exp $
+# $Id: default_homework.lcpm,v 1.149 2010/10/14 19:54:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -320,20 +320,33 @@ sub caparesponse_check_list {
     }
     &LONCAPA_INTERNAL_DEBUG("Final final response :$responses->[0][-1]:$unit:");
     $unit=~s/\s//;
+    my $error;
     foreach my $response (@$responses) {
        foreach my $element (@$response) {	
           if (($type eq 'float') || (($type eq '') && ($unit ne ''))) {
               $element =~ s/\s//g;
           }
           my $appendunit=$unit;
-          if (($unit=~/\%/) && ($answerunit ne '%'))  {
-             $element=$element/100;
-             $appendunit=~s/\%//;
-          }    
+# Deal with percentages
+# unit is unit entered by student, answerunit is unit by author
+# Deprecated: divide answer by 100 if student entered percent,
+# but author did not. Too much confusion
+#          if (($unit=~/\%/) && ($answerunit ne '%'))  {
+#             $element=$element/100;
+#             $appendunit=~s/\%//;
+#          }    
+# Author entered percent, student did not
+          if (($unit!~/\%/) && ($answerunit=~/\%/)) {
+             $element=$element*100;
+             $appendunit='%'.$appendunit;
+          }
+# Zero does not need a dimension
           if (($element==0) && ($unit!~/\w/) && ($answerunit=~/\w/)) {
              $appendunit=$answerunit;
           }
-          $element .= " $appendunit";
+          if ($appendunit ne '') {
+              $element .= " $appendunit";
+          }  
           &LONCAPA_INTERNAL_DEBUG("Made response element :$element:");
        }
     }
@@ -356,6 +369,10 @@ sub caparesponse_check_list {
 	    for (my $j=0; $j<scalar(@$response); $j++) { 
 		my ($award,$msg) = &caparesponse_check($answer->[$j],
 						       $response->[$j]);
+                if ($type eq 'cs' || $type eq 'ci') {
+                    $error = &verify_stringresponse($type,$award,$response->[$j],
+                                                    $answer->[$j]);
+                }
 		push(@awards,$award);
 		push(@msgs,  $msg);
 	    }
@@ -382,6 +399,10 @@ sub caparesponse_check_list {
 		    for (my $j=0; $j<scalar(@$response); $j++) {
 			my ($award,$msg) = &caparesponse_check($answer->[$j],
 							       $response->[$j]);
+                        if ($type eq 'cs' || $type eq 'ci') {
+                            $error = &verify_stringresponse($type,$award,$response->[$j],
+                                                            $answer->[$j]);
+                        }
 			push(@awards,$award);
 			push(@msgs,  $msg);
 		    }
@@ -428,7 +449,29 @@ sub caparesponse_check_list {
     &LONCAPA_INTERNAL_DEBUG(" all final_awards ".join(':',@final_awards));
     my ($final_award,$final_msg) = 
 	&LONCAPA_INTERNAL_FINALIZEAWARDS(\@final_awards,\@final_msg,undef,1);
-    return ($final_award,$final_msg);
+    return ($final_award,$final_msg,$error);
+}
+
+sub verify_stringresponse {
+    my ($type,$award,$resp,$ans) = @_;
+    return if ($award eq 'EXACT_ANS');
+    my $error;
+    if ($resp =~ /^\s|\s$/) {
+        $resp =~ s{^\s+|\s+$}{}g;
+    }
+    if ($ans =~ /^\s|\s$/) {
+        $ans =~ s{^\s+|\s+$}{}g;
+    }
+    if ($type eq 'ci') {
+        $resp = lc($resp);
+        $ans = lc($ans);
+    }
+    if ($resp eq $ans) {
+        if ($award eq 'INCORRECT') {
+            $error = 'MISGRADED';
+        }
+    }
+    return $error;
 }
 
 sub cas {