version 1.87, 2004/06/09 21:16:43
|
version 1.88, 2004/10/05 20:18:29
|
Line 41 sub caparesponse_check {
|
Line 41 sub caparesponse_check {
|
my $type=$LONCAPA::CAPAresponse_args{'type'}; |
my $type=$LONCAPA::CAPAresponse_args{'type'}; |
my $tol=$LONCAPA::CAPAresponse_args{'tol'}; |
my $tol=$LONCAPA::CAPAresponse_args{'tol'}; |
my $sig=$LONCAPA::CAPAresponse_args{'sig'}; |
my $sig=$LONCAPA::CAPAresponse_args{'sig'}; |
my $ans_fmt=$LONCAPA::CAPAresponse_args{'ans_fmt'}; |
my $ans_fmt=$LONCAPA::CAPAresponse_args{'format'}; |
my $unit=$LONCAPA::CAPAresponse_args{'unit'}; |
my $unit=$LONCAPA::CAPAresponse_args{'unit'}; |
my $calc=$LONCAPA::CAPAresponse_args{'calc'}; |
my $calc=$LONCAPA::CAPAresponse_args{'calc'}; |
my $samples=$LONCAPA::CAPAresponse_args{'samples'}; |
my $samples=$LONCAPA::CAPAresponse_args{'samples'}; |
Line 70 sub caparesponse_check {
|
Line 70 sub caparesponse_check {
|
$response=~s/ +/ /g; |
$response=~s/ +/ /g; |
} |
} |
if ($type eq 'float') { $response=~s/,//g; } |
if ($type eq 'float') { $response=~s/,//g; } |
|
&LONCAPA_INTERNAL_DEBUG("fmt $ans_fmt, res is $response"); |
|
if ($type eq 'float' && $ans_fmt=~/\$/) { |
|
if ($response!~/^\$/) { return "NO_UNIT: Missing \$ "; } |
|
$response=~s/\$//g; |
|
} |
|
$ans_fmt=~s/\W//g; |
|
|
if (length($response) > 500) { return "TOO_LONG: Answer too long"; } |
if (length($response) > 500) { return "TOO_LONG: Answer too long"; } |
|
|
if ($type eq '' ) { |
if ($type eq '' ) { |
Line 530 sub chemparse {
|
Line 537 sub chemparse {
|
|
|
sub prettyprint { |
sub prettyprint { |
my ($value,$fmt,$target)=@_; |
my ($value,$fmt,$target)=@_; |
|
&LONCAPA_INTERNAL_DEBUG("format -$fmt-"); |
my $result; |
my $result; |
if (!$target) { $target = $external::target; } |
if (!$target) { $target = $external::target; } |
if ($fmt =~ /chem/i) { return(&chemparse($value)); } |
if ($fmt =~ /chem/i) { return(&chemparse($value)); } |