--- loncom/interface/lonprintout.pm 2003/05/14 20:16:56 1.172 +++ loncom/interface/lonprintout.pm 2003/05/15 14:55:24 1.175 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.172 2003/05/14 20:16:56 bowersj2 Exp $ +# $Id: lonprintout.pm,v 1.175 2003/05/15 14:55:24 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1041,6 +1041,8 @@ sub character_chart { sub page_format { my ($papersize,$layout,$numberofcolumns) = @_; my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0); + + if ($papersize=~/Letter/) { if ($layout eq 'CAPA') { if ($numberofcolumns == 1) { @@ -1477,6 +1479,13 @@ ENDPART } else { $rendered =~ s/\\end{document}//; } + if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + my %form; + $form{'answer_output_mode'}='tex'; + my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain, + $ENV{'request.course.id'},%form); + $rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/; + } $current_output .= $rendered; } $flag_latex_header_remove = 'YES'; @@ -1504,19 +1513,29 @@ ENDPART $selectionmade = 6; my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'}; @list_of_files=sort @list_of_files; - my $flag_latex_header_remove = 'NO'; + my $flag_latex_header_remove = 'NO'; + my $rndseed=time; for (my $i=0;$i<=$#list_of_files;$i++) { my $urlp = $list_of_files[$i]; if ($urlp=~/\//) { my %form; $form{'grade_target'}='tex'; $form{'textwidth'}=$LaTeXwidth; + $form{'rndseed'}=$rndseed; if ($urlp =~ m|/home/([^/]+)/public_html|) { $urlp =~ s|/home/([^/]*)/public_html|/~$1|; } else { $urlp =~ s|^/home/httpd/html||; } my $texversion=&Apache::lonnet::ssi($urlp,%form); + if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + my %form; + $form{'grade_target'}='answer'; + $form{'answer_output_mode'}='tex'; + $form{'rndseed'}=$rndseed; + my $answer=&Apache::lonnet::ssi($urlp,%form); + $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; + } #this chunck is responsible for printing the path to problem my $newurlp = ''; my $HowMany = length($urlp)*2; @@ -1546,6 +1565,7 @@ ENDPART } $flag_latex_header_remove = 'YES'; } + if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\typeout)/ RANDOM SEED IS $rndseed $1/;} $result .= '\end{document}'; } #-------------------------------------------------------- corrections for the different page formats