version 1.99, 2003/05/13 15:47:45
|
version 1.104, 2003/06/04 15:23:08
|
Line 309 sub end_numericalresponse {
|
Line 309 sub end_numericalresponse {
|
if ($Apache::inputtags::params{'sig'}) { |
if ($Apache::inputtags::params{'sig'}) { |
($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'}); |
($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'}); |
} |
} |
if ($fmt) { |
if ($fmt && $$tagstack[-1] eq 'numericalresponse') { |
$ans = sprintf('%.'.$fmt,$ans); |
$ans = sprintf('%.'.$fmt,$ans); |
if ($high) { |
if ($high) { |
$high=sprintf('%.'.$fmt,$high); |
$high=sprintf('%.'.$fmt,$high); |
Line 317 sub end_numericalresponse {
|
Line 317 sub end_numericalresponse {
|
} |
} |
} |
} |
if ($target eq 'answer') { |
if ($target eq 'answer') { |
if ($high) { $ans.=' ['.$low.','.$high.']'; } |
if ($high && $$tagstack[-1] eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; } |
if ($sighigh) { |
if ($sighigh && $$tagstack[-1] eq 'numericalresponse') { |
if (($ENV{'form.print_answer'} eq 'yes') && ($ENV{'form.grade_target'} eq 'answer')) { |
if ($ENV{'form.answer_output_mode'} eq 'tex') { |
$ans.= " Sig \\textit{$siglow - $sighigh}"; |
$ans.= " Sig \\textit{$siglow - $sighigh}"; |
} else { |
} else { |
$ans.= " Sig <i>$siglow - $sighigh</i>"; |
$ans.= " Sig <i>$siglow - $sighigh</i>"; |
} |
} |
} |
} |
$result.=&Apache::response::answer_part($$tagstack[-1],$ans); |
$result.=&Apache::response::answer_part($$tagstack[-1],$ans); |
Line 334 sub end_numericalresponse {
|
Line 334 sub end_numericalresponse {
|
} |
} |
} |
} |
} |
} |
if ($unit) { |
if (defined($unit) and ($unit ne '') and |
|
$$tagstack[-1] eq 'numericalresponse') { |
if ($target eq 'answer') { |
if ($target eq 'answer') { |
if (($ENV{'form.print_answer'} eq 'yes') && ($ENV{'form.grade_target'} eq 'answer')) { |
if ($ENV{'form.answer_output_mode'} eq 'tex') { |
$result.=&Apache::response::answer_part($$tagstack[-1], |
$result.=&Apache::response::answer_part($$tagstack[-1], |
"Unit: \\verb|$unit|"); |
"Unit: \\verb|$unit|"); |
} else { |
} else { |
Line 344 sub end_numericalresponse {
|
Line 345 sub end_numericalresponse {
|
"Unit: <b>$unit</b>"); |
"Unit: <b>$unit</b>"); |
} |
} |
} elsif ($target eq 'analyze') { |
} elsif ($target eq 'analyze') { |
push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, |
push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, $unit); |
$unit); |
|
} |
} |
} |
} |
if ($type || $token->[1] eq 'stringresponse') { |
if ($type || $$tagstack[-1] eq 'stringresponse') { |
my $string='Case Insensitive'; |
my $string='Case Insensitive'; |
if ($type eq 'mc') { |
if ($type eq 'mc') { |
$string='Multiple Choice'; |
$string='Multiple Choice'; |
Line 360 sub end_numericalresponse {
|
Line 360 sub end_numericalresponse {
|
$string='Formula'; |
$string='Formula'; |
} |
} |
if ($target eq 'answer') { |
if ($target eq 'answer') { |
$result.=&Apache::response::answer_part($$tagstack[-1], |
if ($ENV{'form.answer_output_mode'} eq 'tex') { |
'<b>'.$string.'</b>'); |
$result.=&Apache::response::answer_part($$tagstack[-1], |
|
"\\textbf{$string}"); |
|
} else { |
|
$result.=&Apache::response::answer_part($$tagstack[-1], |
|
"<b>$string</b>"); |
|
} |
} elsif ($target eq 'analyze') { |
} elsif ($target eq 'analyze') { |
push (@{ $Apache::lonhomework::analyze{"$part_id.type"} }, |
push (@{ $Apache::lonhomework::analyze{"$part_id.str_type"} }, |
$type); |
$type); |
} |
} |
} |
} |
Line 489 sub start_stringresponse {
|
Line 494 sub start_stringresponse {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
if ($target eq 'meta') { |
if ($target eq 'meta') { |
|
&Apache::response::start_response($parstack,$safeeval); |
$result=&Apache::response::meta_package_write('stringresponse'); |
$result=&Apache::response::meta_package_write('stringresponse'); |
|
&Apache::response::end_response(); |
} else { |
} else { |
$result.=&start_numericalresponse(@_); |
$result.=&start_numericalresponse(@_); |
} |
} |
Line 504 sub start_formularesponse {
|
Line 511 sub start_formularesponse {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
if ($target eq 'meta') { |
if ($target eq 'meta') { |
|
&Apache::response::start_response($parstack,$safeeval); |
$result=&Apache::response::meta_package_write('formularesponse'); |
$result=&Apache::response::meta_package_write('formularesponse'); |
|
&Apache::response::end_response(); |
} else { |
} else { |
$result.=&start_numericalresponse(@_); |
$result.=&start_numericalresponse(@_); |
} |
} |