--- loncom/homework/caparesponse/caparesponse.pm 2003/09/22 18:47:59 1.112 +++ loncom/homework/caparesponse/caparesponse.pm 2003/09/22 20:49:01 1.114 @@ -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.114 2003/09/22 20:49:01 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -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*)$/) {