loncom/homework/caparesponse/caparesponse.pm - diff

Return to caparesponse.pm CVS log

Up to [LON-CAPA] / loncom / homework / caparesponse

Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.96 and 1.102

version 1.96, 2003/05/09 22:00:16	version 1.102, 2003/05/19 21:15:21
Line 165 sub end_numericalresponse {	Line 165 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 ($award =~ /^correct/ \|\| $status eq "SHOW_ANSWER" \|\| $ENV{'form.texaward'} eq '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 306 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 314 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) { $ans.= " Sig <i>$siglow - $sighigh</i>"; }	if ($sighigh && $$tagstack[-1] eq 'numericalresponse') {
	if ($ENV{'form.answer_output_mode'} eq 'tex') {
	$ans.= " Sig \\textit{$siglow - $sighigh}";
	} else {
	$ans.= " Sig <i>$siglow - $sighigh</i>";
	}
	}
$result.=&Apache::response::answer_part($$tagstack[-1],$ans);	$result.=&Apache::response::answer_part($$tagstack[-1],$ans);
} elsif ($target eq 'analyze') {	} elsif ($target eq 'analyze') {
push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} }, $ans);	push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} }, $ans);
Line 325 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') {
$result.=&Apache::response::answer_part($$tagstack[-1],	if ($ENV{'form.answer_output_mode'} eq 'tex') {
"Unit: <b>$unit</b>");	$result.=&Apache::response::answer_part($$tagstack[-1],
	"Unit: \\verb\|$unit\|");
	} else {
	$result.=&Apache::response::answer_part($$tagstack[-1],
	"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);
Line 346 sub end_numericalresponse {	Line 361 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.type"} },
$type);	$type);

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.96
changed lines
	Added in v.1.102