--- loncom/homework/caparesponse/caparesponse.pm	2007/08/29 21:57:47	1.219
+++ loncom/homework/caparesponse/caparesponse.pm	2008/06/10 15:22:39	1.226
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.219 2007/08/29 21:57:47 albertel Exp $
+# $Id: caparesponse.pm,v 1.226 2008/06/10 15:22:39 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -310,6 +310,11 @@ sub start_numericalresponse {
 						    $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);
@@ -318,6 +323,22 @@ 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) = @_;
@@ -609,7 +630,6 @@ sub end_numericalresponse {
 	my $part_id="$partid.$id";
 	if ($target eq 'analyze') {
 	    push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
-	    push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1);
 	    $Apache::lonhomework::analyze{"$part_id.type"} = $tag;
 	    my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
 	    if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
@@ -679,12 +699,12 @@ sub end_numericalresponse {
 			    #}
 			}
 			if ($high && $tag eq 'numericalresponse') {
-			    $element.=' ['.$low.','.$high.']';
+			    $element.='; ['.$low.'; '.$high.']';
 			    $tolline .= "[$low, $high]";
 			}
 			if (defined($sighigh) && $tag eq 'numericalresponse') {
 			    if ($env{'form.answer_output_mode'} eq 'tex') {
-				$element.= " Sig $siglow - $sighigh";
+				$element.= "; Sig $siglow - $sighigh";
 			    } else {
 				$element.= " Sig <i>$siglow - $sighigh</i>";
 				$sigline .= "[$siglow, $sighigh]";
@@ -704,7 +724,7 @@ sub end_numericalresponse {
 		    }
 		}
 		if ($target eq 'answer') {
-		    $result.= &Apache::response::answer_part($tag,join(', ',@all_answer_info));
+		    $result.= &Apache::response::answer_part($tag,join('; ',@all_answer_info));
 		}
 	    }
 
@@ -788,7 +808,16 @@ sub end_numericalresponse {
     }
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
 	$target eq 'tex' || $target eq 'analyze') {
-	&Apache::lonxml::increment_counter($increment);
+        if (($tag eq 'formularesponse') && ($target eq 'analyze')) {
+            my $type = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.type');
+            if ($type eq 'exam') {
+                $increment = &Apache::response::repetition();
+            }
+        }
+	&Apache::lonxml::increment_counter($increment,"$partid.$id");
+	if ($target eq 'analyze') {
+	    &Apache::lonhomework::set_bubble_lines();
+	}
     }
     &Apache::response::end_response();
     return $result;
@@ -980,13 +1009,23 @@ sub make_numerical_bubbles {
     $ind=&Math::Random::random_uniform_integer(1,0,$#factors);
     my $factor = $factors[$ind];
     my @bubble_display;
+    my $answerfactor=$answer;
+    if ($answer==0) { 
+       $answerfactor=&Math::Random::random_uniform_integer(1,1,100)/
+                     &Math::Random::random_uniform_integer(1,1,10);
+    }
     for ($ind=0;$ind<$number_of_bubbles;$ind++) {
-	$bubble_values[$ind] = $answer*($factor**($power-$powers[$#powers-$ind]));
+	$bubble_values[$ind] = $answerfactor*($factor**($power-$powers[$#powers-$ind]));
 	$bubble_display[$ind] = &format_number($bubble_values[$ind],
 					       $format,$target,$safeeval);
-
     }
     my $correct = $alphabet[$number_of_bubbles-$power];
+    if ($answer==0) {
+       $correct='A';
+       $bubble_values[0]=0;
+       $bubble_display[0] = &format_number($bubble_values[0],
+                                           $format,$target,$safeeval);
+    }
     &Math::Random::random_set_seed(@oldseed);
     return (\@bubble_values,\@bubble_display,$correct);
 }
@@ -1228,7 +1267,11 @@ sub end_stringresponse {
     }
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
 	$target eq 'tex' || $target eq 'analyze') {
-	&Apache::lonxml::increment_counter(&Apache::response::repetition());
+	&Apache::lonxml::increment_counter(&Apache::response::repetition(),
+					   "$part.$id");
+	if ($target eq 'analyze') {
+	    &Apache::lonhomework::set_bubble_lines();
+	}
     }
     &Apache::response::end_response;
     return $result;