--- loncom/homework/caparesponse/caparesponse.pm	2003/07/28 18:29:05	1.107
+++ loncom/homework/caparesponse/caparesponse.pm	2003/10/15 21:26:46	1.107.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.107 2003/07/28 18:29:05 sakharuk Exp $
+# $Id: caparesponse.pm,v 1.107.2.3 2003/10/15 21:26:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -114,7 +114,6 @@ 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>");
 		
@@ -131,6 +130,7 @@ 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,10 +169,7 @@ sub end_numericalresponse {
 						     $safeeval);
 	my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	my $status = $Apache::inputtags::status['-1'];
-	if (   ($award =~ /^correct/
-                && lc($Apache::lonhomework::problemstatus) ne 'no')
-             || $status eq "SHOW_ANSWER"
-             || $ENV{'form.texaward'} eq 'SHOW_ANSWER') {
+	if (  &Apache::response::show_answer() ) {
 	    my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
 							 $safeeval);
 	    my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
@@ -234,11 +231,16 @@ 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].'"><b>'.
-				$alphabet[$ind].'</b>: '.
-				    $bubble_values[$ind].'</td>';
+			    '" value="'.$bubble_values[$ind].'" '.$checked
+			    .' /><b>'.$alphabet[$ind].'</b>: '.
+			    $bubble_values[$ind].'</td>';
 		    }
 		    $result.='</tr></table>';
 		} elsif ($$tagstack[-1] eq 'formularesponse') {