--- loncom/homework/default_homework.lcpm 2012/11/22 02:15:42 1.152.2.3 +++ loncom/homework/default_homework.lcpm 2012/11/21 23:22:43 1.162 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # used by lonxml::xmlparse() as input variable $safeinit to Apache::run::run() # -# $Id: default_homework.lcpm,v 1.152.2.3 2012/11/22 02:15:42 raeburn Exp $ +# $Id: default_homework.lcpm,v 1.162 2012/11/21 23:22:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -253,8 +253,6 @@ sub caparesponse_check { elsif ($result =='15') { $result='UNIT_IRRECONCIBLE'; } else {$result = "ERROR: Unknown Result:$result:$@:";} -# &LONCAPA_INTERNAL_DEBUG("RetError $reterror: Answer $answer: Response $response: type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|"); -# &LONCAPA_INTERNAL_DEBUG(" $answer $response $result "); return ($result,$reterror); } @@ -265,7 +263,7 @@ sub caparesponse_check_list { my $type = $LONCAPA::CAPAresponse_args{'type'}; my $answerunit=$LONCAPA::CAPAresponse_args{'unit'}; &LONCAPA_INTERNAL_DEBUG("Got type :$type: answer unit :$answerunit:\n"); - + my $preprocess=$LONCAPA::CAPAresponse_args{'preprocess'}; $preprocess=~s/^\&//; @@ -309,9 +307,10 @@ sub caparesponse_check_list { my ($allowalgebra)=($LONCAPA::CAPAresponse_args{'allowalgebra'}=~/^(yes|1|on)$/i); if ($type eq 'float' || $type eq '') { #for numerical problems split off the unit - my ($part1,$part2); + my $part1; + my $part2; if ($allowalgebra) { - ($part1,$part2)=($responses->[0][-1]=~ /^(.*[^\s])\s+([^\s]+)$/); + ($part1,$part2)=($responses->[0][-1]=~ /^(.*[^\s])\s+([^\s]+)$/); } else { ($part1,$part2)=($responses->[0][-1]=~ /^([\d\.\,\s\$]*(?:(?:[xX\*]10[\^\*]*|[eE]*)[\+\-]*\d*)*(?:^|\S)\d+)([\$\s\w\^\*\/\(\)\+\-]*[^\d\.\s\,][\$\s\w\^\*\/\(\)\+\-]*)$/); } @@ -1184,7 +1183,7 @@ sub middlename { $middlename = '' if $middlename eq ""; return $middlename; } - + sub lastname { my $lastname = &EXT('environment.lastname'); $lastname = '' if $lastname eq "";