--- loncom/homework/caparesponse/caparesponse.pm	2003/09/22 18:47:59	1.112
+++ loncom/homework/caparesponse/caparesponse.pm	2003/10/14 22:53:22	1.115
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.112 2003/09/22 18:47:59 albertel Exp $
+# $Id: caparesponse.pm,v 1.115 2003/10/14 22:53:22 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,9 +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") {
+	if (  &Apache::response::show_answer() ) {
 	    my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
 							 $safeeval);
 	    my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
@@ -411,7 +409,7 @@ sub format_number {
 	my $format = '';
 	#What is the number? (integer,decimal,floating point)
 	if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) {
-	    if (abs($3)>=100) {$format = 'e3';} else {$format = 'e2';}
+	    $format = '3e';
 	} elsif ($number=~/^(\d*)\.(\d*)$/) {
 	    $format = '4f';
 	} elsif ($number=~/^(\d*)$/) {