--- loncom/homework/default_homework.lcpm	2010/10/14 19:54:56	1.149
+++ loncom/homework/default_homework.lcpm	2011/05/22 03:04:51	1.155
@@ -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.149 2010/10/14 19:54:56 raeburn Exp $
+# $Id: default_homework.lcpm,v 1.155 2011/05/22 03:04:51 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -357,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;
@@ -366,7 +383,15 @@ 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') {
@@ -397,6 +422,14 @@ 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') {
@@ -449,7 +482,7 @@ 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,$error);
+    return ($final_award,$final_msg,$error,$control_chars_removed,$ansstring);
 }
 
 sub verify_stringresponse {
@@ -1092,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');
@@ -1163,6 +1209,40 @@ sub answer_date_epoch {
     return &EXT('resource.'.$partid.'.answerdate');
 }
 
+sub parameter_setting {
+    my ($which,$partid)=@_;
+    unless ($partid) { $partid=0; }
+    return &EXT('resource.'.$partid.'.'.$which);
+}
+
+sub stored_data {
+    my ($which,$partid)=@_;
+    unless ($partid) { $partid=0; }
+    return &EXT('user.resource.resource.'.$partid.'.'.$which);
+}
+
+sub wrong_bubbles {
+    my ($correct,$lower,$upper,$step,@given)=@_;
+    my @array=();
+    my %hash=();
+    foreach my $new (@given) {
+        $hash{$new}=1;
+    }
+    my $num=int(&parameter_setting('numbubbles',&currentpart()));
+    unless ($num) { $num=8; }
+    if ($num>1) {
+        for (my $i=0;$i<=500;$i++) {
+            my $new=&random($lower,$upper,$step);
+            if ($hash{$new}) { next; }
+            if (abs($new-$correct)<$step) { next; }
+            $hash{$new}=1;
+            @array=keys(%hash);
+            if ($#array+2>=$num) { last; }
+        }
+    }
+    return @array;
+}
+
 sub array_moments {
     my @input=@_;
     my (@output,$N);