--- loncom/homework/caparesponse/caparesponse.pm 2003/06/04 15:23:08 1.104 +++ loncom/homework/caparesponse/caparesponse.pm 2003/08/21 17:33:22 1.108 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.104 2003/06/04 15:23:08 bowersj2 Exp $ +# $Id: caparesponse.pm,v 1.108 2003/08/21 17:33:22 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -150,6 +150,10 @@ sub end_numericalresponse { $expression.=';my $type="float";'; } $expression.="');"; + my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); + &Apache::lonxml::debug('answer is'.join(':',@answer)); + @{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=@answer; + $result = &Apache::run::run($expression,$safeeval); my ($awards) = split /:/ , $result; ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); @@ -243,7 +247,7 @@ sub end_numericalresponse {

'; } } elsif ($target eq 'tex') { - if (defined $unit and $Apache::lonhomework::type eq 'exam') { + if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) { $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} '; } if ($$tagstack[-1] eq 'numericalresponse') { @@ -320,7 +324,7 @@ sub end_numericalresponse { if ($high && $$tagstack[-1] eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; } if ($sighigh && $$tagstack[-1] eq 'numericalresponse') { if ($ENV{'form.answer_output_mode'} eq 'tex') { - $ans.= " Sig \\textit{$siglow - $sighigh}"; + $ans.= " Sig $siglow - $sighigh"; } else { $ans.= " Sig $siglow - $sighigh"; } @@ -339,7 +343,7 @@ sub end_numericalresponse { if ($target eq 'answer') { if ($ENV{'form.answer_output_mode'} eq 'tex') { $result.=&Apache::response::answer_part($$tagstack[-1], - "Unit: \\verb|$unit|"); + " Unit: $unit "); } else { $result.=&Apache::response::answer_part($$tagstack[-1], "Unit: $unit"); @@ -362,7 +366,7 @@ sub end_numericalresponse { if ($target eq 'answer') { if ($ENV{'form.answer_output_mode'} eq 'tex') { $result.=&Apache::response::answer_part($$tagstack[-1], - "\\textbf{$string}"); + "$string"); } else { $result.=&Apache::response::answer_part($$tagstack[-1], "$string");