--- loncom/interface/lonprintout.pm 2003/05/12 20:29:39 1.163 +++ loncom/interface/lonprintout.pm 2003/05/14 20:16:56 1.172 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.163 2003/05/12 20:29:39 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.172 2003/05/14 20:16:56 bowersj2 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -481,15 +481,16 @@ ENDPART $selectionmade = 1; if ($ENV{'form.url'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) { my %moreenv; - $moreenv{'form.grade_target'}='tex'; if (&Apache::lonnet::allowed('bre',$ENV{'form.url'})) { $ENV{'form.url'}=~s/http:\/\/[^\/]+//; } $moreenv{'request.filename'}=$ENV{'form.url'}; - $moreenv{'form.textwidth'}=$LaTeXwidth; + my %form; + $form{'textwidth'}=$LaTeXwidth; + $form{'grade_target'}='tex'; &Apache::lonnet::appenv(%moreenv); - my $texversion=&Apache::lonnet::ssi($ENV{'form.url'}); - &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter'); + my $texversion=&Apache::lonnet::ssi($ENV{'form.url'},%form); + &Apache::lonnet::delenv('form.counter'); $result .= $texversion; if ($ENV{'form.url'}=~m/\.page\s*$/) { ($result,$number_of_columns) = &page_cleanup($result); @@ -523,13 +524,12 @@ ENDPART } elsif ($choice eq 'Standard LaTeX output for whole primary sequence') { $selectionmade = 3; } - my %moreenv; - $moreenv{'form.grade_target'}='tex'; - $moreenv{'form.textwidth'}=$LaTeXwidth; - &Apache::lonnet::appenv(%moreenv); + my %form; + $form{'textwidth'}=$LaTeXwidth; + $form{'grade_target'}='tex'; + $form{'symb'}=$symb; #&Apache::lonnet::logthis("Trying to get $urlp with symb $symb"); - my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb)); - &Apache::lonnet::delenv('form.grade_target','form.textwidth'); + my $texversion=&Apache::lonnet::ssi($urlp,%form); if ($urlp =~ m/\.page/) { ($texversion,my $number_of_columns_page) = &page_cleanup($texversion); if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} @@ -563,12 +563,11 @@ ENDPART my ($urlp,$symb) = split /&&/, $file_seq[$i]; $urlp=~s/\/home\/httpd\/html//; if ($urlp=~m/\.(problem|exam|quiz|assess|survey|form|library)/) { - my %moreenv; - $moreenv{'form.grade_target'}='tex'; - $moreenv{'form.textwidth'}=$LaTeXwidth; - &Apache::lonnet::appenv(%moreenv); - my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb)); - &Apache::lonnet::delenv('form.grade_target','form.textwidth'); + my %form; + $form{'grade_target'}='tex'; + $form{'textwidth'}=$LaTeXwidth; + $form{'symb'}=$symb; + my $texversion=&Apache::lonnet::ssi($urlp,%form); if ($flag_latex_header_remove ne 'NO') { $texversion = &latex_header_footer_remove($texversion); } else { @@ -658,17 +657,15 @@ ENDPART for (my $i=0;$i<=$#list_of_files;$i++) { my $urlp = $list_of_files[$i]; if ($urlp=~/\//) { - my %moreenv; - $moreenv{'form.grade_target'}='tex'; - $moreenv{'form.textwidth'}=$LaTeXwidth; - &Apache::lonnet::appenv(%moreenv); + my %form; + $form{'grade_target'}='tex'; + $form{'textwidth'}=$LaTeXwidth; if ($urlp =~ m|/home/([^/]+)/public_html|) { $urlp =~ s|/home/([^/]*)/public_html|/~$1|; } else { $urlp =~ s|^/home/httpd/html||; } - my $texversion=&Apache::lonnet::ssi($urlp); - &Apache::lonnet::delenv('form.grade_target','form.textwidth'); + my $texversion=&Apache::lonnet::ssi($urlp,%form); #this chunck is responsible for printing the path to problem my $newurlp = ''; my $HowMany = length($urlp)*2; @@ -1037,7 +1034,6 @@ sub character_chart { $result =~ s/&(Phi|\#934);/\$\\Phi \$/g; $result =~ s/&(Psi|\#936);/\$\\Psi \$/g; $result =~ s/&(Omega|\#937);/\$\\Omega \$/g; - return $result; } @@ -1375,29 +1371,23 @@ ENDPART $selectionmade = 1; if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) { my %moreenv; - $moreenv{'form.grade_target'}='tex'; $moreenv{'request.filename'}=$currentURL; - $moreenv{'form.textwidth'}=$LaTeXwidth; + my %form; + $form{'grade_target'}='tex'; + $form{'textwidth'}=$LaTeXwidth; + my $rndseed=time; + $form{'rndseed'}=$rndseed; &Apache::lonnet::appenv(%moreenv); - my $texversion=&Apache::lonnet::ssi($currentURL); - &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter'); + my $texversion=&Apache::lonnet::ssi($currentURL,%form); + &Apache::lonnet::delenv('form.counter'); + &Apache::lonnet::delenv('request.filename'); if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { - $moreenv{'form.grade_target'}='answer'; - &Apache::lonnet::appenv(%moreenv); - my $answer=&Apache::lonnet::ssi($currentURL); - &Apache::lonnet::delenv('form.grade_target'); - my $start=index($answer,'',$start); - if ($start!=-1 && $finish!=-1) {$answer=substr($answer,$start,$finish-$start+8);} - $answer=~s/<\/td>\s*/ \\\\ \\hline /g; - $answer=~s/]*)>/\\vskip 0 mm \\begin{tabular}{|c|}\\hline /; - $answer=~s/<\/table>/\\end{tabular}\\vskip 0 mm/; - $answer=~s/\s*//; - $answer=~s/<\/td>\s*<\/tr>/\\\\ \\hline /; - $answer=~s/([^\#]*)<\/b>/\\verb|$1|/; - $answer=~s/([^\#]*)<\/i>/\\textit{$1}/; -# $r->print('
'.$answer.'
'); return OK; - $texversion=~s/(\\end{document})/$answer$1/; + my %form; + $form{'grade_target'}='answer'; + $form{'answer_output_mode'}='tex'; + $form{'rndseed'}=$rndseed; + my $answer=&Apache::lonnet::ssi($currentURL,%form); + $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; } $result .= $texversion; if ($currentURL=~m/\.page\s*$/) { @@ -1429,13 +1419,12 @@ ENDPART } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') { $selectionmade = 4; } - my %moreenv; - $moreenv{'form.grade_target'}='tex'; - $moreenv{'form.textwidth'}=$LaTeXwidth; - &Apache::lonnet::appenv(%moreenv); + my %form; + $form{'grade_target'}='tex'; + $form{'textwidth'}=$LaTeXwidth; + $form{'symb'}=$master_seq[$i]; #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]"); - my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$master_seq[$i])); - &Apache::lonnet::delenv('form.grade_target','form.textwidth'); + my $texversion=&Apache::lonnet::ssi($urlp,%form); if ($urlp=~/\.page$/) { ($texversion,my $number_of_columns_page) = &page_cleanup($texversion); if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} @@ -1447,6 +1436,13 @@ ENDPART } else { $texversion =~ s/\\end{document}//; } + if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + my %form; + $form{'grade_target'}='answer'; + $form{'answer_output_mode'}='tex'; + my $answer=&Apache::lonnet::ssi($urlp,%form); + $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/; + } $result .= $texversion; $flag_latex_header_remove = 'YES'; } @@ -1512,17 +1508,15 @@ ENDPART for (my $i=0;$i<=$#list_of_files;$i++) { my $urlp = $list_of_files[$i]; if ($urlp=~/\//) { - my %moreenv; - $moreenv{'form.grade_target'}='tex'; - $moreenv{'form.textwidth'}=$LaTeXwidth; - &Apache::lonnet::appenv(%moreenv); + my %form; + $form{'grade_target'}='tex'; + $form{'textwidth'}=$LaTeXwidth; if ($urlp =~ m|/home/([^/]+)/public_html|) { $urlp =~ s|/home/([^/]*)/public_html|/~$1|; } else { $urlp =~ s|^/home/httpd/html||; } - my $texversion=&Apache::lonnet::ssi($urlp); - &Apache::lonnet::delenv('form.grade_target','form.textwidth'); + my $texversion=&Apache::lonnet::ssi($urlp,%form); #this chunck is responsible for printing the path to problem my $newurlp = ''; my $HowMany = length($urlp)*2; @@ -1841,7 +1835,7 @@ HELPERFRAGMENT &Apache::lonxml::xmlparse($r, 'helper', < (mark them then click "next" button)
- + PAGESIZE return $isProblemOrMap return $isProblem @@ -1903,7 +1897,8 @@ CHOOSE_FROM_SUBDIR $paramHash->{CHOICES} = $printChoices; Apache::lonhelper::choices->new(); - if ($ENV{'request.role.adv'}) { + if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or + ($helper->{VARS}->{'construction'} eq '1')) { $paramHash = Apache::lonhelper::getParamHash(); $paramHash->{MESSAGE_TEXT} = "
Next option is available only for advanced users:
"; Apache::lonhelper::message->new();