--- loncom/homework/caparesponse/caparesponse.pm	2008/06/10 15:22:39	1.226
+++ loncom/homework/caparesponse/caparesponse.pm	2008/09/12 09:56:10	1.232
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.226 2008/06/10 15:22:39 www Exp $
+# $Id: caparesponse.pm,v 1.232 2008/09/12 09:56:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -311,9 +311,7 @@ sub start_numericalresponse {
 	    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");
+            ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER')) {
         }
 	if (  &Apache::response::show_answer() ) {
 	    &set_answertext($tag_internal_answer_name,$target,$token,$tagstack,
@@ -323,22 +321,6 @@ sub start_numericalresponse {
     return $result;
 }
 
-sub edit_formula_button {
-    my ($id,$field)=@_;
-    my $button=&mt('Edit Answer');
-    my $helplink=&Apache::loncommon::help_open_topic('Formula_Editor');
-    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);" />$helplink
-ENDFORMULABUTTON
-}
-
 sub set_answertext {
     my ($name,$target,$token,$tagstack,$parstack,$parser,$safeeval,
 	$response_level) = @_;
@@ -465,7 +447,7 @@ sub check_submission {
 	use Time::HiRes;
 	my $t0 = [Time::HiRes::gettimeofday()];
 	my ($result,@msgs) = 
-	    &Apache::run::run("&caparesponse_check_list()",$safeeval);
+	    &Apache::run::run("&caparesponse_check_list($tag)",$safeeval);
 	&Apache::lonxml::debug("checking $name $result with $response took ".&Time::HiRes::tv_interval($t0));
 	&Apache::lonxml::debug('msgs are '.join(':',@msgs));
 	my ($awards)=split(/:/,$result);
@@ -531,12 +513,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);
@@ -623,6 +605,13 @@ 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.'.turnoneditor') ne 'no')){	   
+           $result.=&Apache::response::edit_mathresponse_button($id,"HWVAL_$id");
+#hier
+        }
+            
 	&Apache::response::setup_prior_tries_hash(\&format_prior_response_numerical);
     } elsif ($target eq 'edit') {
 	$result.='</td></tr>'.&Apache::edit::end_table;
@@ -1178,7 +1167,7 @@ sub end_stringresponse {
 		    foreach my $name (keys(%answer)) {
 			&Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} }));
 			${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=dclone($answer{$name});
-			my ($result, @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval);
+			my ($result, @msgs)=&Apache::run::run("&caparesponse_check_list($$tagstack[-1])",$safeeval);
 			&Apache::lonxml::debug('msgs are'.join(':',@msgs));
 			my ($awards)=split(/:/,$result);
 			my (@awards) = split(/,/,$awards);