--- loncom/homework/caparesponse/caparesponse.pm 2002/10/17 14:40:58 1.66 +++ loncom/homework/caparesponse/caparesponse.pm 2002/11/06 17:58:27 1.68 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.66 2002/10/17 14:40:58 sakharuk Exp $ +# $Id: caparesponse.pm,v 1.68 2002/11/06 17:58:27 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -157,7 +157,6 @@ sub end_numericalresponse { } } } elsif ($target eq 'web' || $target eq 'tex') { - if ($Apache::lonhomework::type ne 'exam') { my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; my $status = $Apache::inputtags::status['-1']; if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) { @@ -199,7 +198,6 @@ sub end_numericalresponse { $result.="}. \\vskip 0 mm "; } } - } else { my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval); my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval); @@ -278,7 +276,7 @@ sub end_numericalresponse { my $power = $2; $power=~s/^\+//; $power=~s/^(-?)0+(\d+)//; - $ans=$number.'$\times 10^{'.$1.$2.'}$'; + $ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs } } else { my $badans = $bubbles_values[$ind]; @@ -297,7 +295,7 @@ sub end_numericalresponse { my $power = $2; $power=~s/^\+//; $power=~s/^(-?)0+(\d+)//; - $ans=$number.'$\times 10^{'.$1.$2.'}$'; + $ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs } } $result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$ans.'} '; @@ -308,12 +306,8 @@ sub end_numericalresponse { $result.='\\\\\end{tabular}\vskip 0 mm '; } $result.='\end{enumerate}'; - $Apache::lonxml::counter++; - my %moreenv; - $moreenv{'form.counter'}=$Apache::lonxml::counter; - &Apache::lonnet::appenv(%moreenv); + &Apache::lonxml::increment_counter(); } - } } elsif ($target eq 'edit') { $result.=''.&Apache::edit::end_table; } elsif ($target eq 'answer' || $target eq 'analyze') {