--- loncom/homework/caparesponse/caparesponse.pm	2008/02/01 23:00:56	1.221
+++ loncom/homework/caparesponse/caparesponse.pm	2008/09/13 02:46:59	1.227.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.221 2008/02/01 23:00:56 raeburn Exp $
+# $Id: caparesponse.pm,v 1.227.2.2 2008/09/13 02:46:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -310,6 +310,10 @@ sub start_numericalresponse {
 						    $safeeval);
 	    if ($unit =~ /\S/) { $result.=" (in $unit) "; }
 	}
+        if (($token->[1] eq 'formularesponse') && 
+            ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER')) {
+            $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 +322,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) = @_;
@@ -427,8 +447,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) {
@@ -678,12 +702,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]";
@@ -703,7 +727,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));
 		}
 	    }
 
@@ -988,13 +1012,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);
 }
@@ -1141,7 +1175,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)) {