--- loncom/homework/caparesponse/caparesponse.pm	2008/05/30 16:04:33	1.225
+++ loncom/homework/caparesponse/caparesponse.pm	2011/02/26 01:45:02	1.236.12.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.225 2008/05/30 16:04:33 www Exp $
+# $Id: caparesponse.pm,v 1.236.12.2 2011/02/26 01:45:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -305,16 +305,11 @@ sub start_numericalresponse {
 	my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
 	&Apache::lonxml::debug("Got unit $hideunit for $partid $id");
 	#no way to enter units, with radio buttons
-	if (lc($hideunit) eq "yes") {
+        if ((lc($hideunit) eq "yes") && ($Apache::lonhomework::type ne 'exam')) {
 	    my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
 						    $safeeval);
 	    if ($unit =~ /\S/) { $result.=" (in $unit) "; }
 	}
-        if (($token->[1] eq 'formularesponse') && 
-            ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') &&
-            (!&Apache::lonxml::get_param_var('samples',$parstack,$safeeval))) {
-            $result.=&edit_formula_button($id,"HWVAL_$id");
-        }
 	if (  &Apache::response::show_answer() ) {
 	    &set_answertext($tag_internal_answer_name,$target,$token,$tagstack,
 			    $parstack,$parser,$safeeval,-1);
@@ -323,21 +318,6 @@ sub start_numericalresponse {
     return $result;
 }
 
-sub edit_formula_button {
-    my ($id,$field)=@_;
-    my $button=&mt('Edit Answer');
-    return(<<ENDFORMULABUTTON);
-<script language="JavaScript">
-function edit_${id}_${field} (textarea) {
-    thenumber = textarea;
-    thedata = document.forms['lonhomework'].elements[textarea].value;
-    newwin = window.open("/adm/dragmath/applet/MaximaPopup.html","","width=565,height=400,resizable");
-}
-</script>
-<input type='button' value='$button' onclick="javascript:edit_${id}_${field}('${field}');void(0);" />
-ENDFORMULABUTTON
-}
-
 sub set_answertext {
     my ($name,$target,$token,$tagstack,$parstack,$parser,$safeeval,
 	$response_level) = @_;
@@ -447,8 +427,12 @@ sub check_submission {
 	}
     } elsif ($tag eq 'numericalresponse') {
 	$$args_ref{'type'}='float';
+    } elsif ($tag eq 'stringresponse') {
+        if ($$args_ref{'type'} eq '') {
+            $$args_ref{'type'} = 'ci';
+        }
     }
-    
+
     &add_in_tag_answer($parstack,$safeeval);
 
     if (!%answer) {
@@ -530,12 +514,12 @@ sub end_numericalresponse {
 		&Apache::lonxml::debug($$parstack[-1] . "\n<br>");
 		
 		if ( &Apache::response::submitted('scantron')) {
-		    &add_in_tag_answer($parstack,$safeeval);
-		    my ($values,$display)=&make_numerical_bubbles($partid,$id,
-						  $target,$parstack,$safeeval);
-		    $response=$values->[$response];
-		}
-		$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
+	    &add_in_tag_answer($parstack,$safeeval);
+	    my ($values,$display)=&make_numerical_bubbles($partid,$id,
+					  $target,$parstack,$safeeval);
+	    $response=$values->[$response];
+	}
+	$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
 		my ($ad,$msg,$name)=&check_submission($response,$partid,$id,
 						      $tag,$parstack,
 						      $safeeval);
@@ -622,6 +606,12 @@ sub end_numericalresponse {
 		}
 	    }
 	}
+        if (($target eq 'web') && ($tag eq 'formularesponse')
+            && ($Apache::lonhomework::type ne 'exam') && ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER')
+	    && (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) {
+            $result.=&Apache::response::edit_mathresponse_button($id,"HWVAL_$id");
+        }
+            
 	&Apache::response::setup_prior_tries_hash(\&format_prior_response_numerical);
     } elsif ($target eq 'edit') {
 	$result.='</td></tr>'.&Apache::edit::end_table;
@@ -762,16 +752,17 @@ sub end_numericalresponse {
 	    if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {
 		my $error;
 		if ($tag eq 'formularesponse') {
-		    $error=&mt('Computer\'s answer is incorrect ("[_1]").',join(', ',@$response));
+		    $error=&mt("Computer's answer is incorrect ([_1]).",'"'.join(', ',@$response).'"');
 		} else {
 		    # answer failed check if it is sig figs that is failing
 		    my ($ad,$msg)=&check_submission($response,$partid,$id,
 						    $tag,$parstack,
 						    $safeeval,1);
+		    $error=&mt("Computer's answer is incorrect ([_1]).",'"'.join(', ',@$response).'"').' ';
 		    if ($sigline ne '') {
-			$error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_2] or significant figures [_3] need to be adjusted.',join(', ',@$response),$tolline,$sigline);
+			$error.=&mt('It is likely that the tolerance range [_1] or significant figures [_2] need to be adjusted.',$tolline,$sigline);
 		    } else {
-			$error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_2] needs to be adjusted.',join(', ',@$response),$tolline);
+			$error.=&mt('It is likely that the tolerance range [_1] needs to be adjusted.',$tolline);
 		    }
 		}
 		if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {
@@ -1088,6 +1079,7 @@ sub start_stringresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     my $id = &Apache::response::start_response($parstack,$safeeval);
+    undef(%answer);
     if ($target eq 'meta') {
 	$result=&Apache::response::meta_package_write('stringresponse');
     } elsif ($target eq 'edit') {
@@ -1171,7 +1163,9 @@ sub end_stringresponse {
 		    my @args = ('type');
 		    my $args_ref = &setup_capa_args($safeeval,$parstack,
 						    \@args,$response);
-
+                    if ($$args_ref{'type'} eq '') {
+                        $$args_ref{'type'} = 'ci';
+                    }
 		    &add_in_tag_answer($parstack,$safeeval);
 		    my (@final_awards,@final_msgs,@names);
 		    foreach my $name (keys(%answer)) {