--- loncom/interface/lonprintout.pm 2003/05/05 18:48:15 1.150 +++ loncom/interface/lonprintout.pm 2003/05/14 13:10:11 1.166 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.150 2003/05/05 18:48:15 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.166 2003/05/14 13:10:11 albertel 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; + $from{'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; } @@ -1349,34 +1345,7 @@ ENDPART $laystyle='book'; } my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format_new($papersize,$laystyle,$numberofcolumns); - - - - -# my $choice = $ENV{'form.choice'}; -# my $layout = $ENV{'form.layout'}; -# my $numberofcolumns = $ENV{'form.numberofcolumns'}; -# my $papersize = $ENV{'form.papersize'}; -# my $laystyle = 'book'; my $assignment = $ENV{'form.assignment'}; -# if ($choice eq 'Subdirectory print') { -# if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';} -# if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';} -# if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;} -# } -# if (($choice eq 'Standard LaTeX output for current document') && -# ($ENV{'form.url'}=~m|^/~|)) { -# if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';} -# if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';} -# if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;} -# } - - -# my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns); -# if ($numberofcolumns == 1) { -# $textwidth=$ENV{'form.width'}; -# $textheight=$ENV{'form.height'}; -# } my $LaTeXwidth; if ($textwidth=~/(\d+)\s*cm/) { $LaTeXwidth = $1*10; @@ -1386,33 +1355,43 @@ ENDPART $LaTeXwidth = $1*25.4; } $LaTeXwidth.=' mm'; - - + if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') { #-- single document - problem, page, html, xml, ... my $currentURL; - if (defined $helper->{'VARS'}->{'url'}) { - $currentURL=$helper->{'VARS'}->{'url'}; - } else { + if ($helper->{'VARS'}->{'construction'} ne '1') { + #prins published resource $currentURL=$helper->{'VARS'}->{'postdata'}; + } else { + #prins resource from the construction space + $currentURL=$helper->{'VARS'}->{'filename'}; + $currentURL=~s/\/home\//\/~/; + $currentURL=~s/public_html\///; } $selectionmade = 1; if ($currentURL=~/\.(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',$currentURL)) { - $currentURL=~s/http:\/\/[^\/]+//; - } - $moreenv{'request.filename'}=$currentURL; - $moreenv{'form.textwidth'}=$LaTeXwidth; - &Apache::lonnet::appenv(%moreenv); - my $texversion=&Apache::lonnet::ssi($currentURL); - &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter'); - $result .= $texversion; - if ($currentURL=~m/\.page\s*$/) { - ($result,$number_of_columns) = &page_cleanup($result); - } - } else { + my %moreenv; + $moreenv{'request.filename'}=$currentURL; + my %form; + $form{'grade_target'}='tex'; + $form{'textwidth'}=$LaTeXwidth; + &Apache::lonnet::appenv(%moreenv); + my $texversion=&Apache::lonnet::ssi($currentURL,$form); + &Apache::lonnet::delenv('form.counter'); + &Apache::lonnet::delenv('request.filename'); + if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') { + my %form; + $form{'grade_target'}='answer'; + $form{'print_answer'}='yes'; + my $answer=&Apache::lonnet::ssi($currentURL,%form); +# $r->print('
'.$answer.''); return OK; + $texversion=~s/(\\end{document})/$answer$1/; + } + $result .= $texversion; + if ($currentURL=~m/\.page\s*$/) { + ($result,$number_of_columns) = &page_cleanup($result); + } + } else { # $result='\documentclass[letterpaper]{article}\usepackage{calc}\begin{document}Printout of this type of document is currently not supported: '; # if ($ENV{'form.url'}=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) { # $result.=$1; @@ -1420,9 +1399,7 @@ ENDPART # $result.=$ENV{'form.url'}; # } # $result.=' \end{document}' - } - - + } } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')) { @@ -1440,13 +1417,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;} @@ -1482,10 +1458,7 @@ ENDPART my $fullname = &get_name($username,$userdomain); #goes through all resources, checks if they are available for current student, and produces output foreach my $curresline (@master_seq) { -# my ($curres,$symb) = split /&&/, $curresline; -# if ($curres=~ m/\.(problem|exam|quiz|assess|survey|form|library)/) { if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) { -# my ($map,$id,$res_url) = split(/___/,$symb);$curresres my ($map,$id,$res_url) = split(/___/,$curresline); if (&Apache::lonnet::allowed('bre',$res_url)) { my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain, @@ -1517,60 +1490,54 @@ ENDPART &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); $result .= '\end{document}'; &Apache::lonnet::delenv('form.textwidth'); -# } elsif ($choice eq 'Subdirectory print') { -# #prints selected problems from the subdirectory -# $selectionmade = 6; -# my @list_of_files = (); -# for (my $i=0; $i<$ENV{'form.numberofproblems'};$i++) { -# if ($ENV{'form.whattoprint'.$i}=~/^\//) { -# push @list_of_files,$ENV{'form.whattoprint'.$i}; -# } -# } -# my $flag_latex_header_remove = 'NO'; -# 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); -# 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'); -# #this chunck is responsible for printing the path to problem -# my $newurlp = ''; -# my $HowMany = length($urlp)*2; -# if ($HowMany > $LaTeXwidth) { -# my @temporrary = split '/',$urlp; -# my $HowManyNew = 0; -# for (my $ii=0;$ii<=$#temporrary;$ii++) { -# if ($temporrary[$ii] ne '') { -# $HowManyNew += length($temporrary[$ii])*2; -# if ($HowManyNew < $LaTeXwidth ) { -# $newurlp .= '/'.$temporrary[$ii]; -# } else { -# $HowManyNew = 0; -# $newurlp .= '|\vskip -1 mm \noindent \verb|'; -# $ii--; -# } -# } -# } -# } -# $texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/; -# if ($flag_latex_header_remove ne 'NO') { -# $texversion = &latex_header_footer_remove($texversion); -# } else { -# $texversion =~ s/\\end{document}//; -# } -# $result .= $texversion; -# } -# $flag_latex_header_remove = 'YES'; -# } -# $result .= '\end{document}'; + } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_from_directory') { + #prints selected problems from the subdirectory + $selectionmade = 6; + my @list_of_files=split /\|\|\|/, $helper->{'VARS'}->{'FILES'}; + @list_of_files=sort @list_of_files; + my $flag_latex_header_remove = 'NO'; + 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; + 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); + #this chunck is responsible for printing the path to problem + my $newurlp = ''; + my $HowMany = length($urlp)*2; + if ($HowMany > $LaTeXwidth) { + my @temporrary = split '/',$urlp; + my $HowManyNew = 0; + for (my $ii=0;$ii<=$#temporrary;$ii++) { + if ($temporrary[$ii] ne '') { + $HowManyNew += length($temporrary[$ii])*2; + if ($HowManyNew < $LaTeXwidth ) { + $newurlp .= '/'.$temporrary[$ii]; + } else { + $HowManyNew = 0; + $newurlp .= '|\vskip -1 mm \noindent \verb|'; + $ii--; + } + } + } + } + $texversion =~ s/(\\begin{minipage}{\\textwidth})/$1 {\\small\\noindent\\verb|$newurlp\|\\vskip 0 mm}/; + if ($flag_latex_header_remove ne 'NO') { + $texversion = &latex_header_footer_remove($texversion); + } else { + $texversion =~ s/\\end{document}//; + } + $result .= $texversion; + } + $flag_latex_header_remove = 'YES'; + } + $result .= '\end{document}'; } #-------------------------------------------------------- corrections for the different page formats $result = &page_format_transformation_new($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'}); @@ -1616,12 +1583,13 @@ sub handler { return $result; } $helper = $result; - + + -# my $key; -# foreach $key (keys %{$helper->{'VARS'}}) { -# $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'
What page format do you prefer?
Layout | -Columns | +Page layout | +Number of columns | Paper type |
- Landscape - Portrait + Landscape + Portrait |
- + |