version 1.156, 2011/06/07 22:07:09
|
version 1.158, 2011/06/08 20:38:47
|
Line 270 sub caparesponse_check_list {
|
Line 270 sub caparesponse_check_list {
|
my $type = $LONCAPA::CAPAresponse_args{'type'}; |
my $type = $LONCAPA::CAPAresponse_args{'type'}; |
my $answerunit=$LONCAPA::CAPAresponse_args{'unit'}; |
my $answerunit=$LONCAPA::CAPAresponse_args{'unit'}; |
&LONCAPA_INTERNAL_DEBUG("Got type :$type: answer unit :$answerunit:\n"); |
&LONCAPA_INTERNAL_DEBUG("Got type :$type: answer unit :$answerunit:\n"); |
|
|
|
my $preprocess=$LONCAPA::CAPAresponse_args{'preprocess'}; |
|
$preprocess=~s/^\&//; |
|
|
my $num_input_lines = |
my $num_input_lines = |
scalar(@{$LONCAPA::CAPAresponse_answer->{'answers'}}); |
scalar(@{$LONCAPA::CAPAresponse_answer->{'answers'}}); |
|
|
Line 319 sub caparesponse_check_list {
|
Line 322 sub caparesponse_check_list {
|
} else { |
} else { |
($part1,$part2)=($responses->[0][-1]=~ /^([\d\.\,\s\$]*(?:(?:[xX\*]10[\^\*]*|[eE]*)[\+\-]*\d*)*(?:^|\S)\d+)([\$\s\w\^\*\/\(\)\+\-]*[^\d\.\s\,][\$\s\w\^\*\/\(\)\+\-]*)$/); |
($part1,$part2)=($responses->[0][-1]=~ /^([\d\.\,\s\$]*(?:(?:[xX\*]10[\^\*]*|[eE]*)[\+\-]*\d*)*(?:^|\S)\d+)([\$\s\w\^\*\/\(\)\+\-]*[^\d\.\s\,][\$\s\w\^\*\/\(\)\+\-]*)$/); |
} |
} |
if ($part1 && $part2) { |
if (defined($part1) && defined($part2)) { |
$responses->[0][-1]=$part1; |
$responses->[0][-1]=$part1; |
$unit=&capa_formula_fix($part2); |
$unit=&capa_formula_fix($part2); |
&LONCAPA_INTERNAL_DEBUG("Found unit :$unit:"); |
&LONCAPA_INTERNAL_DEBUG("Found unit :$unit:"); |
Line 329 sub caparesponse_check_list {
|
Line 332 sub caparesponse_check_list {
|
$unit=~s/\s//; |
$unit=~s/\s//; |
my $error; |
my $error; |
foreach my $response (@$responses) { |
foreach my $response (@$responses) { |
foreach my $element (@$response) { |
foreach my $element (@$response) { |
|
# See if we have preprocessor |
|
if ($preprocess=~/\S/) { |
|
if (defined(&$preprocess)) { |
|
no strict 'refs'; |
|
$element=&$preprocess($element,$unit); |
|
use strict 'refs'; |
|
} |
|
} |
if (($type eq 'float') || (($type eq '') && ($unit ne ''))) { |
if (($type eq 'float') || (($type eq '') && ($unit ne ''))) { |
$element =~ s/\s//g; |
$element =~ s/\s//g; |
} |
} |
Line 403 sub caparesponse_check_list {
|
Line 414 sub caparesponse_check_list {
|
} |
} |
} |
} |
} |
} |
|
# See if we have preprocessor |
|
&LONCAPA_INTERNAL_DEBUG("Ordered preprocessor $preprocess"); |
|
if ($preprocess=~/\S/) { |
|
if (defined(&$preprocess)) { |
|
no strict 'refs'; |
|
$response->[$j]=&$preprocess($response->[$j]); |
|
use strict 'refs'; |
|
&LONCAPA_INTERNAL_DEBUG("Ordered processed: $response->[$j]"); |
|
} |
|
} |
|
|
my ($award,$msg) = &caparesponse_check($answer->[$j], |
my ($award,$msg) = &caparesponse_check($answer->[$j], |
$response->[$j]); |
$response->[$j]); |
if ($type eq 'cs' || $type eq 'ci') { |
if ($type eq 'cs' || $type eq 'ci') { |
Line 441 sub caparesponse_check_list {
|
Line 463 sub caparesponse_check_list {
|
} |
} |
} |
} |
} |
} |
|
# See if we have preprocessor |
|
&LONCAPA_INTERNAL_DEBUG("Unordered preprocessor $preprocess"); |
|
if ($preprocess=~/\S/) { |
|
if (defined(&$preprocess)) { |
|
no strict 'refs'; |
|
$response->[$j]=&$preprocess($response->[$j]); |
|
use strict 'refs'; |
|
&LONCAPA_INTERNAL_DEBUG("Unordered processed: $response->[$j]"); |
|
} |
|
} |
|
|
my ($award,$msg) = &caparesponse_check($answer->[$j], |
my ($award,$msg) = &caparesponse_check($answer->[$j], |
$response->[$j]); |
$response->[$j]); |
if ($type eq 'cs' || $type eq 'ci') { |
if ($type eq 'cs' || $type eq 'ci') { |