|
version 1.107.2.1, 2003/09/23 01:52:57
|
version 1.111, 2003/09/22 18:38:59
|
|
Line 169 sub end_numericalresponse {
|
Line 169 sub end_numericalresponse {
|
| $safeeval); |
$safeeval); |
| my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; |
my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; |
| my $status = $Apache::inputtags::status['-1']; |
my $status = $Apache::inputtags::status['-1']; |
| if ( &Apache::response::show_answer() ) { |
if ( ($award =~ /^correct/ |
| |
&& lc($Apache::lonhomework::problemstatus) ne 'no') |
| |
|| $status eq "SHOW_ANSWER" |
| |
|| $ENV{'form.texaward'} eq 'SHOW_ANSWER') { |
| my (@formats)=&Apache::lonxml::get_param_var('format',$parstack, |
my (@formats)=&Apache::lonxml::get_param_var('format',$parstack, |
| $safeeval); |
$safeeval); |
| my $unit=&Apache::lonxml::get_param_var('unit',$parstack, |
my $unit=&Apache::lonxml::get_param_var('unit',$parstack, |
|
Line 191 sub end_numericalresponse {
|
Line 194 sub end_numericalresponse {
|
| } |
} |
| my $formatted; |
my $formatted; |
| if ((defined($format)) && ($format ne '')) { |
if ((defined($format)) && ($format ne '')) { |
| |
$format=~s/e/E/g; |
| &Apache::lonxml::debug("formatting with :$format: answer :$answer:"); |
&Apache::lonxml::debug("formatting with :$format: answer :$answer:"); |
| $formatted=sprintf('%.'.$format,$answer).','; |
$formatted=sprintf('%.'.$format,$answer).','; |
| } else { |
} else { |
|
Line 363 sub end_numericalresponse {
|
Line 367 sub end_numericalresponse {
|
| if ($target eq 'answer') { |
if ($target eq 'answer') { |
| if ($ENV{'form.answer_output_mode'} eq 'tex') { |
if ($ENV{'form.answer_output_mode'} eq 'tex') { |
| $result.=&Apache::response::answer_part($$tagstack[-1], |
$result.=&Apache::response::answer_part($$tagstack[-1], |
| "\\textbf{$string}"); |
"$string"); |
| } else { |
} else { |
| $result.=&Apache::response::answer_part($$tagstack[-1], |
$result.=&Apache::response::answer_part($$tagstack[-1], |
| "<b>$string</b>"); |
"<b>$string</b>"); |
|
Line 413 sub format_number {
|
Line 417 sub format_number {
|
| my ($number,$format,$target)=@_; |
my ($number,$format,$target)=@_; |
| my $ans; |
my $ans; |
| if ($format ne '') { |
if ($format ne '') { |
| |
$format=~s/e/E/g; |
| $ans = sprintf('%.'.$format,$number); |
$ans = sprintf('%.'.$format,$number); |
| } else { |
} else { |
| my $format = ''; |
my $format = ''; |
| #What is the number? (integer,decimal,floating point) |
#What is the number? (integer,decimal,floating point) |
| if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) { |
if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) { |
| $format = 'e'.$2; |
if (abs($3)>=100) {$format = 'e3';} else {$format = 'e2';} |
| } elsif ($number=~/^(\d*)\.(\d*)$/) { |
} elsif ($number=~/^(\d*)\.(\d*)$/) { |
| $format = '4f'; |
$format = '4f'; |
| } elsif ($number=~/^(\d*)$/) { |
} elsif ($number=~/^(\d*)$/) { |
![[BACK]](/icons/back.gif){kind=icon}
Return to caparesponse.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / homework / caparesponse