--- loncom/homework/caparesponse/caparesponse.pm 2005/11/16 22:52:31 1.181 +++ loncom/homework/caparesponse/caparesponse.pm 2005/12/01 22:30:55 1.183 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.181 2005/11/16 22:52:31 albertel Exp $ +# $Id: caparesponse.pm,v 1.183 2005/12/01 22:30:55 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -76,12 +76,12 @@ sub end_answergroup { } sub start_value { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || $target eq 'webgrade' || $target eq 'answer' || $target eq 'analyze' ) { - my $bodytext = &Apache::lonxml::get_all_text("/value",$parser); + my $bodytext = &Apache::lonxml::get_all_text("/value",$parser,$style); $bodytext = &Apache::run::evaluate($bodytext,$safeeval, $$parstack[-1]); push(@{ $answer{$cur_name}{'answers'} },$bodytext); @@ -96,12 +96,12 @@ sub end_value { } sub start_array { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || $target eq 'webgrade' || $target eq 'answer' || $target eq 'analyze' ) { - my $bodytext = &Apache::lonxml::get_all_text("/value",$parser); + my $bodytext = &Apache::lonxml::get_all_text("/array",$parser,$style); my @values = &Apache::run::evaluate($bodytext,$safeeval, $$parstack[-1]); push(@{ $answer{$cur_name}{'answers'} },@values); @@ -517,7 +517,7 @@ sub end_numericalresponse { if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') { my $error; if ($tag eq 'formularesponse') { - $error=&mt('Computer\'s answer is incorrect ("[_1]").'); + $error=&mt('Computer\'s answer is incorrect ("[_1]").',$response); } else { # answer failed check if it is sig figs that is failing my ($ad,$msg)=&check_submission($response,$partid,$id,