--- loncom/homework/caparesponse/caparesponse.pm 2003/08/21 17:33:22 1.108 +++ loncom/homework/caparesponse/caparesponse.pm 2003/09/22 18:38:59 1.111 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.108 2003/08/21 17:33:22 sakharuk Exp $ +# $Id: caparesponse.pm,v 1.111 2003/09/22 18:38:59 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -194,6 +194,7 @@ sub end_numericalresponse { } my $formatted; if ((defined($format)) && ($format ne '')) { + $format=~s/e/E/g; &Apache::lonxml::debug("formatting with :$format: answer :$answer:"); $formatted=sprintf('%.'.$format,$answer).','; } else { @@ -416,12 +417,13 @@ sub format_number { my ($number,$format,$target)=@_; my $ans; if ($format ne '') { + $format=~s/e/E/g; $ans = sprintf('%.'.$format,$number); } else { my $format = ''; #What is the number? (integer,decimal,floating point) if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) { - $format = 'e'.$2; + if (abs($3)>=100) {$format = 'e3';} else {$format = 'e2';} } elsif ($number=~/^(\d*)\.(\d*)$/) { $format = '4f'; } elsif ($number=~/^(\d*)$/) {