--- loncom/interface/lonprintout.pm 2003/10/02 15:33:03 1.247 +++ loncom/interface/lonprintout.pm 2003/10/03 13:21:01 1.250 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.247 2003/10/02 15:33:03 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.250 2003/10/03 13:21:01 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -786,8 +786,9 @@ ENDPART $form{'rndseed'}=$rndseed; $texversion=&Apache::lonnet::ssi($urlp,%form); } - if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') || - ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) { + if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') || + ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) && + ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) { my %form; $form{'grade_target'}='answer'; $form{'answer_output_mode'}='tex'; @@ -879,10 +880,14 @@ ENDPART if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; } else { - $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'}); - $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm '; - $texversion.=&path_to_problem ($urlp,$LaTeXwidth); - $texversion.='\vskip 1 mm '.$answer; + if ($urlp=~/\.(problem|exam|quiz|library)$/) { + $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'}); + $texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($urlp).'}\vskip 0 mm '; + $texversion.=&path_to_problem ($urlp,$LaTeXwidth); + $texversion.='\vskip 1 mm '.$answer; + } else { + $texversion=''; + } } } if ($flag_latex_header_remove ne 'NO') { @@ -933,17 +938,25 @@ ENDPART if (&Apache::lonnet::allowed('bre',$res_url)) { my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain, $ENV{'request.course.id'},'tex'); - if ($flag_latex_header_remove eq 'YES') { - $rendered = &latex_header_footer_remove($rendered); - } else { - $rendered =~ s/\\end{document}//; - } - if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') || + ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) { my %form; $form{'answer_output_mode'}='tex'; $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'}; my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form); - $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/; + if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/; + } else { + $rendered=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'}); + $rendered.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($curresline).'}\vskip 0 mm '; + $rendered.=&path_to_problem ($curresline,$LaTeXwidth); + $rendered.='\vskip 1 mm '.$ansrendered; + } + } + if ($flag_latex_header_remove eq 'YES') { + $rendered = &latex_header_footer_remove($rendered); + } else { + $rendered =~ s/\\end{document}//; } $current_output .= $rendered; } @@ -1352,7 +1365,7 @@ CHOOSE_FROM_SUBDIR # another resource selector for that sequence if (!$helper->{VARS}->{'construction'}) { push @$printChoices, ["Resources from selected sequence in course", - 'map_problems_pages', 'CHOOSE_SEQUENCE']; + 'select_sequences', 'CHOOSE_SEQUENCE']; my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'}; #Escape apostrophes and backslashes for Perl $escapedSequenceName =~ s/\\/\\\\/g;