--- loncom/homework/default_homework.lcpm 2002/09/26 20:45:00 1.51 +++ loncom/homework/default_homework.lcpm 2002/09/26 20:46:48 1.52 @@ -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.51 2002/09/26 20:45:00 albertel Exp $ +# $Id: default_homework.lcpm,v 1.52 2002/09/26 20:46:48 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -57,13 +57,13 @@ sub caparesponse_check { #remove leading and trailing whitespace if ($response=~ /^\s|\s$/) { $response=~ s:^\s+|\s+$::g; - $message .="Removed ws now :$response:
"; + $message .="Removed ws now :$response:\n"; } else { - $message .="no ws in :$response:
"; + $message .="no ws in :$response:\n"; } if ($type eq '' ) { - $message .= "Didn't find a type :$type:$expr: defaulting
"; + $message .= "Didn't find a type :$type:$expr: defaulting\n"; if ( $answer eq ($answer *1.0)) { $type = 2; } else { $type = 3; } } else { @@ -82,7 +82,7 @@ sub caparesponse_check { #formula type setup the sample points if ($type eq '8') { ($id_list,$points)=split(/@/,$samples); - $message.="Found :$points: points
"; + $message.="Found :$points: points\n"; } if ($tol eq '') { $tol=0.0; @@ -127,7 +127,7 @@ sub caparesponse_check { elsif ($result =='12') { $result='WANTED_NUMERIC'; } else {$result = "ERROR: Unknown Result:$result:$@:";} - return "$result:
Error $error:
Answer $answer:
Response $response:
type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|
$message$expr"; + return "$result:\nError $error:\nAnswer $answer:\nResponse $response:\n type-$type|$tol|$tol_type|$sig:$sig_lbound:$sig_ubound|$unit|\n$message$expr"; } sub get_array_args { @@ -140,10 +140,10 @@ sub get_array_args { if ($CAPARESPONSE_CHECK_LIST_answer =~ /^\s*[\$\@]/) { (@GET_ARRAY_ARGS_list) = eval $CAPARESPONSE_CHECK_LIST_answer; } - $GET_ARRAY_ARGS_result.="error:$@:
"; + $GET_ARRAY_ARGS_result.="error:$@:\n"; # if the eval fails just use what is in the answer exactly if (!defined(@GET_ARRAY_ARGS_list) || !defined($GET_ARRAY_ARGS_list[0])) { - $GET_ARRAY_ARGS_result.="list zero is undefined
"; + $GET_ARRAY_ARGS_result.="list zero is undefined\n"; $GET_ARRAY_ARGS_list[0]=$CAPARESPONSE_CHECK_LIST_answer; } return $GET_ARRAY_ARGS_result,@GET_ARRAY_ARGS_list; @@ -156,7 +156,7 @@ sub caparesponse_check_list { my $aresult=''; my $current_answer; my $answers=join(':',@list); - $result.="Got response :$answers:
"; + $result.="Got response :$answers:\n"; my @responselist; my $type =eval $expr.';return $answer;'; if ($type ne '' && $#list > 0) { @@ -165,7 +165,7 @@ sub caparesponse_check_list { (@responselist)=($response); } my $unit=''; - $result.="Initial final response :$responselist['-1']:
"; + $result.="Initial final response :$responselist['-1']:\n"; if ($type eq '') { #for numerical problems split off the unit if ( $responselist['-1']=~ /(.*[^\s])\s+([^\s]+)/ ) { @@ -173,13 +173,13 @@ sub caparesponse_check_list { $unit=$2; } } - $result.="Final final response :$responselist['-1']:
"; - $result.=":$#list: answers
"; + $result.="Final final response :$responselist['-1']:\n"; + $result.=":$#list: answers\n"; $unit=~s/\s//; my $i=0; my $awards=''; for ($i=0; $i<@list;$i++) { - $result.="trying answer :$list[$i]:
"; + $result.="trying answer :$list[$i]:\n"; if ($unit eq '') { $aresult=&caparesponse_check($responselist[$i], $expr.';my $answer=\''.$list[$i].'\';'); @@ -192,7 +192,7 @@ sub caparesponse_check_list { $result.=$aresult; } chop $awards; - return "$awards:
$result"; + return "$awards:\n$result"; } sub tex {