--- loncom/homework/caparesponse/caparesponse.pm	2003/10/23 19:36:02	1.107.2.4
+++ loncom/homework/caparesponse/caparesponse.pm	2003/08/21 17:33:22	1.108
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.107.2.4 2003/10/23 19:36:02 albertel Exp $
+# $Id: caparesponse.pm,v 1.108 2003/08/21 17:33:22 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -114,6 +114,7 @@ sub end_numericalresponse {
 	    if ( $response =~ /[^\s]/) {
 		my $ad;
 		my %previous = &Apache::response::check_for_previous($response,$partid,$id);
+		$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
 		&Apache::lonxml::debug("submitted a $response<br>\n");
 		&Apache::lonxml::debug($$parstack[-1] . "\n<br>");
 		
@@ -130,7 +131,6 @@ sub end_numericalresponse {
 		    $response =~ s/\\/\\\\/g;
 		    $response =~ s/\'/\\\'/g;
 		}
-		$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
 		&Apache::lonxml::debug("current $response");
 		my $expression="&caparesponse_check_list('".$response."','".
 		    $$parstack[-1];
@@ -169,7 +169,10 @@ sub end_numericalresponse {
 						     $safeeval);
 	my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	my $status = $Apache::inputtags::status['-1'];
-	if (  &Apache::response::show_answer() ) {
+	if (   ($award =~ /^correct/
+                && lc($Apache::lonhomework::problemstatus) ne 'no')
+             || $status eq "SHOW_ANSWER"
+             || $ENV{'form.texaward'} eq 'SHOW_ANSWER') {
 	    my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
 							 $safeeval);
 	    my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
@@ -231,16 +234,11 @@ sub end_numericalresponse {
 		if ($$tagstack[-1] eq 'numericalresponse') {
 		    if ($unit=~/\S/) {$result.=' (in '.$unit.')<br /><br />';}
 		    $result.= '<table border="1"><tr>';
-		    my $previous=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.$id.submission"};
 		    for (my $ind=0;$ind<$number_of_bubbles;$ind++) {
-			my $checked='';
-			if ($previous eq $bubble_values[$ind]) {
-			    $checked=" checked='on' ";
-			}
 			$result.='<td><input type="radio" name="HWVAL_'.$id.
-			    '" value="'.$bubble_values[$ind].'" '.$checked
-			    .' /><b>'.$alphabet[$ind].'</b>: '.
-			    $bubble_values[$ind].'</td>';
+			    '" value="'.$bubble_values[$ind].'"><b>'.
+				$alphabet[$ind].'</b>: '.
+				    $bubble_values[$ind].'</td>';
 		    }
 		    $result.='</tr></table>';
 		} elsif ($$tagstack[-1] eq 'formularesponse') {
@@ -368,7 +366,7 @@ sub end_numericalresponse {
 	    if ($target eq 'answer') {
 		if ($ENV{'form.answer_output_mode'} eq 'tex') {
 		    $result.=&Apache::response::answer_part($$tagstack[-1],
-							  "\\textbf{$string}");
+							  "$string");
 		} else {
 		    $result.=&Apache::response::answer_part($$tagstack[-1],
 							    "<b>$string</b>");
@@ -445,7 +443,6 @@ sub format_number {
 
 sub make_numerical_bubbles {
     my ($number_of_bubbles,$target,$answer,$format) =@_;
-    my @oldseed=&Math::Random::random_get_seed();
     my @bubble_values = ();
     my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors
     my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers
@@ -460,7 +457,6 @@ sub make_numerical_bubbles {
 					       $format,$target);
 
     }
-    &Math::Random::random_set_seed(@oldseed);
     return @bubble_values;
 }