version 1.139, 2008/09/12 09:56:09
|
version 1.141, 2008/09/27 07:26:45
|
Line 259 sub caparesponse_check {
|
Line 259 sub caparesponse_check {
|
|
|
|
|
sub caparesponse_check_list { |
sub caparesponse_check_list { |
my ($tag) = @_; |
|
my $responses=$LONCAPA::CAPAresponse_args{'response'}; |
my $responses=$LONCAPA::CAPAresponse_args{'response'}; |
&LONCAPA_INTERNAL_DEBUG("args ".join(':',%LONCAPA::CAPAresponse_args)); |
&LONCAPA_INTERNAL_DEBUG("args ".join(':',%LONCAPA::CAPAresponse_args)); |
my $type = $LONCAPA::CAPAresponse_args{'type'}; |
my $type = $LONCAPA::CAPAresponse_args{'type'}; |
Line 304 sub caparesponse_check_list {
|
Line 303 sub caparesponse_check_list {
|
|
|
&LONCAPA_INTERNAL_DEBUG("Initial final response :$responses->[0][-1]:"); |
&LONCAPA_INTERNAL_DEBUG("Initial final response :$responses->[0][-1]:"); |
my $unit; |
my $unit; |
if (($type eq 'float') || (($type eq '') && (($tag ne 'stringresponse') && ($tag ne 'stringhint')) ) ) { |
if ($type eq 'float' || $type eq '') { |
#for numerical problems split off the unit |
#for numerical problems split off the unit |
# if ( $responses->[0][-1]=~ /(.*[^\s])\s+([^\s]+)/ ) { |
# if ( $responses->[0][-1]=~ /(.*[^\s])\s+([^\s]+)/ ) { |
if ( $responses->[0][-1]=~ /^([\d\.\,\s\$]*(?:(?:[xX\*]10[\^\*]*|[eE]*)[\+\-]*\d*)*(?:^|\S)\d+)([\$\s\w\^\*\/\(\)\+\-]*[^\d\.\s\,][\$\s\w\^\*\/\(\)\+\-]*)$/ ) { |
if ( $responses->[0][-1]=~ /^([\d\.\,\s\$]*(?:(?:[xX\*]10[\^\*]*|[eE]*)[\+\-]*\d*)*(?:^|\S)\d+)([\$\s\w\^\*\/\(\)\+\-]*[^\d\.\s\,][\$\s\w\^\*\/\(\)\+\-]*)$/ ) { |
Line 321 sub caparesponse_check_list {
|
Line 320 sub caparesponse_check_list {
|
$element =~ s/\s//g; |
$element =~ s/\s//g; |
} |
} |
my $appendunit=$unit; |
my $appendunit=$unit; |
if ($unit=~/\%/) { |
if (($unit=~/\%/) && ($answerunit ne '%')) { |
$element=$element/100; |
$element=$element/100; |
$appendunit=~s/\%//; |
$appendunit=~s/\%//; |
} |
} |