--- loncom/interface/lonprintout.pm 2002/11/14 14:47:53 1.86 +++ loncom/interface/lonprintout.pm 2002/11/18 15:20:56 1.90 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.86 2002/11/14 14:47:53 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.90 2002/11/18 15:20:56 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -92,13 +92,13 @@ sub menu_for_output { Current document $title_for_single_resource (prints what you just saw on the screen)
ENDMENUOUT1 - if ((not $ENV{'request.role'}=~m/^au\./) and (not $ENV{'request.role'}=~m/^ca\./)) { + if ($ENV{'form.postdata'}=~/\/res\//) { $r->print(< All problems from $title_for_sequence
- All problems plus any pages or html/xml files from $title_for_sequence
+ Problem(s) from $title_for_sequence
+ Problem(s) plus page(s) or html/xml file(s) from $title_for_sequence
ENDMENUOUT2 } - if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) { + if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($ENV{'form.postdata'}=~/\/res\//)) { $r->print(< All problems in this course (warning: this may be time consuming)

@@ -149,6 +149,68 @@ ENDMENUOUT5 } +sub sequence_content_menu { + my ($key_to,$r) = @_; + my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'}); + my @sequence = split('___',$symbolic); + my $primary_sequence = '/res/'.$sequence[0]; + my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]); + my @master_seq_view = @master_seq; + for (my $i=0;$i<=$#master_seq_view;$i++) { + $master_seq_view[$i]=~/\/([^\/]+)$/; + $master_seq_view[$i]=$1; + } + $r->print(< + + + + +

Mark item(s) which you want to print

+ +  + +

+ENDMENUOUT1 + my $inc=0; + for (my $i=0;$i<=$#master_seq_view;$i++) { + if ($key_to==1 && $master_seq_view[$i]=~/\.(problem|exam|quiz|assess|survey|form|library)$/) { + $r->print('
'. + $master_seq_view[$i]); + $inc++; + } elsif ($key_to==0 && $master_seq_view[$i]=~/\.(problem|exam|quiz|assess|survey|form|library|xml|htm|html|page)$/) { + $r->print('
'. + $master_seq_view[$i]); + $inc++; + } + } + $r->print(< + + + +ENDMENUOUT2 + +} + + sub problem_choice_menu { my $r = shift; my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'}); @@ -213,6 +275,7 @@ ENDMENUOUT1 } $r->print(< + @@ -294,7 +357,12 @@ ENDDISHEADER } } $r->print(< +
Number of blank pages to add: +
@@ -312,6 +380,9 @@ sub additional_print_menu { for (my $i=0; $i<$ENV{'form.numberofproblems'};$i++) { $what_to_print .= ''; } + for (my $i=0; $i<$ENV{'form.numberoffiles'};$i++) { + $what_to_print .= ''; + } $r->print(< @@ -320,8 +391,10 @@ sub additional_print_menu { + + Define one column layout parameters:
Width:
Height:
@@ -353,14 +426,14 @@ ENDPART my $laystyle = 'book'; my $assignment = $ENV{'form.assignment'}; if ($choice eq 'Subdirectory print') { - $layout = 'CAPA'; - $papersize = 'Letter [8 1/2x11 in]'; - $numberofcolumns = 2; + 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{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./)) { - $layout = 'CAPA'; - $papersize = 'Letter [8 1/2x11 in]'; - $numberofcolumns = 1; + 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 $result = ''; my $number_of_columns = 1; #used only for pages to determine the width of the cell @@ -394,56 +467,42 @@ ENDPART $choice eq 'Standard LaTeX output for whole primary sequence') { #-- minimal sequence to which the current document belongs #-- where is the primary sequence containing file? - my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'}); - my @sequence = split('___',$symbolic); - my $primary_sequence = '/res/'.$sequence[0]; - my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]); + my @master_seq = (); + for (my $i=0; $i<$ENV{'form.numberoffiles'};$i++) { + if ($ENV{'form.whatfile'.$i}=~/\S/) { + push @master_seq,$ENV{'form.whatfile'.$i}; + } + } #-- produce an output string my $flag_latex_header_remove = 'NO'; my $flag_page_in_sequence = 'NO'; for (my $i=0;$i<=$#master_seq;$i++) { - my ($urlp,$symb) = split /&&/, $master_seq[$i]; + my ($urlp,$symb) = split /&&/, $master_seq[$i]; if ($choice eq 'Standard LaTeX output for the primary sequence') { - #prints only problems - $selectionmade = 2; - 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); - &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'); - 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'; - } - } elsif ($urlp =~ /\S+/) { - #prints problems, pages and any html/xml files - $selectionmade = 3; - my %moreenv; - $moreenv{'form.grade_target'}='tex'; - &Apache::lonnet::appenv(%moreenv); - my $texversion=&Apache::lonnet::ssi($urlp,('symb'=>$symb)); - &Apache::lonnet::delenv('form.grade_target'); - 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;} - $texversion =~ s/\\end{document}\d*/\\end{document}/; - $flag_page_in_sequence = 'YES'; - } - 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'; + $selectionmade = 2; + } 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); + &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'); + 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;} + $texversion =~ s/\\end{document}\d*/\\end{document}/; + $flag_page_in_sequence = 'YES'; + } + 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'; } &Apache::lonnet::delenv('form.counter'); if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;} @@ -518,9 +577,11 @@ ENDPART } if ($current_output=~/\\documentclass/) { my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'}; - $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\setlength{\\headheight}{1cm}\\setlength{\\headsep}{0.5cm}\\pagestyle{myheadings}\\markboth{}{{\\textbf{$fullname} $courseidinfo - $assignment}}\\begin{document} /; + $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\setlength{\\headheight}{1cm}\\setlength{\\headsep}{0.5cm}\\pagestyle{myheadings}\\markboth{}{{$courseidinfo - $assignment}}\\begin{document}\\noindent\\textit{\\textbf{$fullname}}\\vskip 3 mm /; } else { - $current_output = '\\vskip 3mm\noindent\parbox{\minipagewidth}{\noindent\fbox{\textbf{'.$fullname.'}}\hskip 1.4in } \vskip 5 mm '.$current_output; + my $blanspages = ''; + for (my $j=0;$j<$ENV{'form.addedpages'};$j++) {$blanspages.='\clearpage\strut\clearpage';} + $current_output = '\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License } \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\textit{\textbf{'.$fullname.'}}\hskip 1.4in } \vskip 5 mm '.$current_output; } $result .= $current_output; &Apache::lonnet::delenv('form.counter'); @@ -1218,7 +1279,11 @@ sub handler { } #-- additional menu for class printing if ($ENV{'form.phase'} eq 'two') { - if($ENV{'form.choice'} eq 'All class print') { + if($ENV{'form.choice'} eq 'Standard LaTeX output for whole primary sequence') { + &sequence_content_menu(0,$r); + } elsif($ENV{'form.choice'} eq 'Standard LaTeX output for the primary sequence') { + &sequence_content_menu(1,$r); + } elsif($ENV{'form.choice'} eq 'All class print') { &additional_class_menu($r); } elsif($ENV{'form.choice'} eq 'Subdirectory print') { &problem_choice_menu($r);