--- loncom/homework/caparesponse/caparesponse.pm	2003/09/19 21:48:00	1.109
+++ 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.109 2003/09/19 21:48:00 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,20 +169,13 @@ 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,
 						    $safeeval);
 	    if ($target eq 'web') {
 		$result="<br />The correct answer is ";
-	    } elsif ($target eq 'tex') {
-		if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') {
-		    $result='\vskip 0 mm The correct answer is \\texttt{ ';
-		}
 	    }
 	    for (my $i=0; $i <= $#answers; $i++) {
 		my $answer=$answers[$i];
@@ -201,9 +194,6 @@ sub end_numericalresponse {
 		    &Apache::lonxml::debug("no format answer :$answer:");
 		    $formatted="$answer,";
 		}
-		if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') {
-		    $result.=$formatted;
-		}
 		if ($target eq 'tex') {
 		    $formatted='';
 		    #$formatted=&Apache::lonxml::latex_special_symbols($formatted);
@@ -213,11 +203,6 @@ sub end_numericalresponse {
 	    chop $result;
 	    if ($target eq 'web') {
 		$result.=" $unit.<br />";
-	    } elsif ($target eq 'tex') {		
-		if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') {
-		    $result.=&Apache::lonxml::latex_special_symbols($unit);
-		    $result.="}. \\vskip 0 mm ";
-		}
 	    }
 	}
 	if ($Apache::lonhomework::type eq 'exam') {
@@ -315,6 +300,7 @@ sub end_numericalresponse {
 		($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
 	    }
 	    if ($fmt && $$tagstack[-1] eq 'numericalresponse') {
+		$fmt=~s/e/E/g;
 		$ans = sprintf('%.'.$fmt,$ans);
 		if ($high) {
 		    $high=sprintf('%.'.$fmt,$high);
@@ -423,7 +409,7 @@ sub format_number {
 	my $format = '';
 	#What is the number? (integer,decimal,floating point)
 	if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) {
-	    $format = 'e'.$2;
+	    $format = '3e';
 	} elsif ($number=~/^(\d*)\.(\d*)$/) {
 	    $format = '4f';
 	} elsif ($number=~/^(\d*)$/) {