--- loncom/homework/default_homework.lcpm	2009/12/27 19:40:42	1.146
+++ loncom/homework/default_homework.lcpm	2011/05/21 14:08:06	1.153
@@ -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.146 2009/12/27 19:40:42 www Exp $
+# $Id: default_homework.lcpm,v 1.153 2011/05/21 14:08:06 www 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;
+# 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:");
        }
     }
@@ -344,6 +357,23 @@ sub caparesponse_check_list {
 	}
     }
 
+    my $allow_control_char = 0;
+    my $control_chars_removed = 0;
+    my $ansstring;
+    if ($type eq 'cs' || $type eq 'ci') {
+        if (ref($LONCAPA::CAPAresponse_answer->{'answers'}) eq 'ARRAY') {
+            foreach my $strans (@{$LONCAPA::CAPAresponse_answer->{'answers'}}) {
+                if (ref($strans) eq 'ARRAY') {
+                    $ansstring = join("\0",@{$strans});
+                    foreach my $item (@{$strans}) {  
+                        if ($item =~ /[\000-\037]/) {
+                            $allow_control_char = 1;
+                        }
+                    }
+                }
+            }
+        }
+    }
 
 #    &LONCAPA_INTERNAL_DEBUG(&LONCAPA_INTERNAL_Dumper($responses));
     my %memoized;
@@ -353,9 +383,21 @@ sub caparesponse_check_list {
 	    my $response = $responses->[$i];
 	    my $key = "$answer\0$response";
 	    my (@awards,@msgs);
-	    for (my $j=0; $j<scalar(@$response); $j++) { 
+	    for (my $j=0; $j<scalar(@$response); $j++) {
+                if ($type eq 'cs' || $type eq 'ci') {
+                    unless ($allow_control_char) {
+                        if ($response->[$j] =~ /[\000-\037]/) { 
+                            $response->[$j] =~ s/[\000-\037]//g;
+                            $control_chars_removed = 1;
+                        }  
+                    }
+                }
 		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);
 	    }
@@ -380,8 +422,20 @@ sub caparesponse_check_list {
 		} else {
 		    my (@awards,@msgs);
 		    for (my $j=0; $j<scalar(@$response); $j++) {
+                        if ($type eq 'cs' || $type eq 'ci') {
+                            unless ($allow_control_char) {
+                                if ($response->[$j] =~ /[\000-\037]/) {
+                                    $response->[$j] =~ s/[\000-\037]//g;
+                                    $control_chars_removed = 1;
+                                }
+                            }
+                        }
 			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 +482,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,$control_chars_removed,$ansstring);
+}
+
+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 {
@@ -1049,11 +1125,24 @@ sub class {
     return $course;
 }
 
+sub classid {
+    my $courseid = &EXT('request.course.id');
+    $courseid = '' if $courseid eq "";
+    return $courseid;
+}
+
 sub firstname {
     my $firstname = &EXT('environment.firstname');
     $firstname = '' if $firstname eq "";
     return $firstname;
 }
+
+sub middlename {
+    my $middlename = &EXT('environment.middlename');
+    $middlename = '' if $middlename eq "";
+    return $middlename;
+}
+
                                                                                 
 sub lastname {
     my $lastname = &EXT('environment.lastname');