--- loncom/interface/lonprintout.pm 2003/03/06 18:16:04 1.128 +++ loncom/interface/lonprintout.pm 2003/05/14 13:33:27 1.168 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.128 2003/03/06 18:16:04 bowersj2 Exp $ +# $Id: lonprintout.pm,v 1.168 2003/05/14 13:33:27 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; + $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 { @@ -605,7 +604,7 @@ ENDPART my %moreenv; $moreenv{'form.textwidth'}=$LaTeXwidth; &Apache::lonnet::appenv(%moreenv); - my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin2($r,'Print Status','Class Print Status',$#students+1); + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1); foreach my $person (@students) { my $current_output = ''; my ($usersection,$username,$userdomain) = split /:/,$person; @@ -639,10 +638,10 @@ ENDPART $result .= $current_output; &Apache::lonnet::delenv('form.counter'); &Apache::lonxml::init_counter(); - &Apache::lonhtmlcommon::Increment_PrgWin2($r,\%prog_state, + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, 'last student '.$fullname); } - &Apache::lonhtmlcommon::Close_PrgWin2($r,\%prog_state); + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); $result .= '\end{document}'; &Apache::lonnet::delenv('form.textwidth'); } elsif ($choice eq 'Subdirectory print') { @@ -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; } @@ -1106,7 +1102,86 @@ sub character_chart { # } elsif($papersize=~/A6/) { } return $textwidth,$textheight,$oddoffset,$evenoffset; +} + + +sub page_format_new { +# +#Correspondence between $papersize variable and real paper format: +# 0 - "Letter [8 1/2x11 in]" +# 1 - "Legal [8 1/2x14 in]" +# 2 - "Ledger/Tabloid [11x17 in]" +# 3 - "Executive [7 1/2x10 in]" +# 4 - "A2 [420x594 mm]" +# 5 - "A3 [297x420 mm]" +# 6 - "A4 [210x297 mm]" +# 7 - "A5 [148x210 mm]" +# 8 - "A6 [105x148 mm]" +# + my ($papersize,$layout,$numberofcolumns) = @_; + my ($textwidth,$textheight,$oddoffset,$evenoffset) = (0,0,0,0); + if ($papersize eq '0') { + if ($layout eq 'book') { + if ($numberofcolumns == 1) { + $textwidth = '18 cm'; + $textheight = '25.9 cm'; + $oddoffset = '-0.57 in'; + $evenoffset = '-0.57 in'; + } elsif ($numberofcolumns == 2) { + $textwidth = '93 mm'; + $textheight = '25.9 cm'; + $oddoffset = '-0.57 in'; + $evenoffset = '-0.57 in'; + } + } elsif ($layout eq 'album') { + if ($numberofcolumns eq '1') { + $textwidth = '8.8 in'; + $textheight = '6.8 in'; + $oddoffset = '-40 pt'; + $evenoffset = '-60 pt'; + } elsif ($numberofcolumns == 2) { + $textwidth = '4.2 in'; + $textheight = '6.8 in'; + $oddoffset = '-40 pt'; + $evenoffset = '-60 pt'; + } + } +# } elsif($papersize eq '1') { +# } elsif($papersize eq '2') { +# } elsif($papersize eq '3'/) { + } elsif($papersize eq '6') { + if ($layout eq 'book') { + if ($numberofcolumns == 1) { + $textwidth = '18 cm'; + $textheight = '28 cm'; + $oddoffset = '-0.57 in'; + $evenoffset = '-0.57 in'; + } elsif ($numberofcolumns == 2) { + $textwidth = '96 mm'; + $textheight = '2 cm'; + $oddoffset = '-0.57 in'; + $evenoffset = '-0.57 in'; + } + } elsif ($layout eq 'album') { + if ($numberofcolumns eq '1') { + $textwidth = '8.5 in'; + $textheight = '7.7 in'; + $oddoffset = '-40 pt'; + $evenoffset = '-60 pt'; + } elsif ($numberofcolumns == 2) { + $textwidth = '3.9 in'; + $textheight = '7.7 in'; + $oddoffset = '-40 pt'; + $evenoffset = '-60 pt'; + } + } +# } elsif($papersize eq '5') { +# } elsif($papersize eq '4') { +# } elsif($papersize eq '7') { +# } elsif($papersize eq '8') { } + return $textwidth,$textheight,$oddoffset,$evenoffset; +} sub get_name { @@ -1148,6 +1223,36 @@ sub page_format_transformation { } +sub page_format_transformation_new { + my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_; + my ($textwidth,$textheight,$oddoffset,$evenoffset); + $assignment=~s/_/ /g; + if ($numberofcolumns != 1) { + ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format_new($papersize,$layout,$numberofcolumns); + } else { + ($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'}); + } + my $name = &get_name(); + if ($name =~ /^\s*$/) { + $name=&Apache::lonxml::latex_special_symbols($ENV{'user.name'},undef, + undef,'header'); + } + my $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'','','header'); + if ($layout eq 'album') { + $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm} \\begin{document}\\setcounter{page}{1}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$name}} \\hfill $courseidinfo} \\vskip 5 mm /; + } elsif ($layout eq 'book') { + if ($choice ne 'All class print') { + $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}/; + } else { + $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\\setcounter{page}{1} \\vskip 5 mm /; + + } + } + return $text; +} + + + sub page_cleanup { my $result = shift; @@ -1218,22 +1323,291 @@ sub latex_corrections { } +sub output_data_new { + my ($r,$helper) = @_; + $r->print(< + +LON-CAPA output for printing + + +
+ENDPART + + my $format_from_helper = $helper->{'VARS'}->{'FORMAT'}; + my ($result,$selectionmade) = ('',''); + my $number_of_columns = 1; #used only for pages to determine the width of the cell + my @temporary_array=split /\|/,$format_from_helper; + my ($laystyle,$numberofcolumns,$papersize)=@temporary_array; + if ($laystyle eq 'L') { + $laystyle='album'; + } else { + $laystyle='book'; + } + my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format_new($papersize,$laystyle,$numberofcolumns); + my $assignment = $ENV{'form.assignment'}; + my $LaTeXwidth; + if ($textwidth=~/(\d+)\s*cm/) { + $LaTeXwidth = $1*10; + } elsif ($textwidth=~/(\d+)\s*mm/) { + $LaTeXwidth = $1; + } elsif ($textwidth=~/(\d+)\s*in/) { + $LaTeXwidth = $1*25.4; + } + $LaTeXwidth.=' mm'; + + if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') { + #-- single document - problem, page, html, xml, ... + my $currentURL; + 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{'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{'answer_output_mode'}='tex'; + 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; +# } else { +# $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')) { + #-- produce an output string + my $flag_latex_header_remove = 'NO'; + my $flag_page_in_sequence = 'NO'; + my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'}; + for (my $i=0;$i<=$#master_seq;$i++) { + $master_seq[$i]=~/___\d+___(.*)$/; + my $urlp='/res/'.$1; + if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') { + $selectionmade = 2; + } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') { + $selectionmade = 3; + } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') { + $selectionmade = 4; + } + 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,%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;} + $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}/;} + $result .= '\end{document}'; + } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') { + #-- prints assignments for whole class or for selected students + $selectionmade=5; + my @students=split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'}; + my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'}; + #loop over students + my $flag_latex_header_remove = 'NO'; + my %moreenv; + $moreenv{'form.textwidth'}=$LaTeXwidth; + &Apache::lonnet::appenv(%moreenv); + my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1); + foreach my $person (@students) { + my $current_output = ''; +# my ($usersection,$username,$userdomain) = split /:/,$person; + my ($username,$userdomain) = split /:/,$person; + 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) { + if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) { + my ($map,$id,$res_url) = split(/___/,$curresline); + 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}//; + } + $current_output .= $rendered; + } + $flag_latex_header_remove = 'YES'; + } + } + my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'}; + if ($current_output=~/\\documentclass/) { + $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\vskip 3 mm /; + } else { + my $blanspages = ''; + for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';} + $current_output = '\strut\\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 }\\newpage \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}\hskip 1.4in } \vskip 5 mm '.$current_output; + } + $result .= $current_output; + &Apache::lonnet::delenv('form.counter'); + &Apache::lonxml::init_counter(); + &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, + 'last student '.$fullname); + } + &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); + $result .= '\end{document}'; + &Apache::lonnet::delenv('form.textwidth'); + } 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'}); +# if ($layout eq 'CBI') { +# $laystyle = 'album'; +# } + $result = &latex_corrections($number_of_columns,$result); +# #changes page's parameters for the one column output +# if ($ENV{'form.numberofcolumns'} == 1) { +# $result =~ s/\\textwidth= 9cm/\\textwidth= $ENV{'form.width'}/; +# $result =~ s/\\textheight 25\.9cm/\\textheight $ENV{'form.height'}/; +# $result =~ s/\\evensidemargin = -0\.57in/\\evensidemargin= $ENV{'form.leftmargin'}/; +# $result =~ s/\\oddsidemargin = -0\.57in/\\oddsidemargin= $ENV{'form.leftmargin'}/; +# } +#-- writing .tex file in prtspool + my $temp_file; + my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".time."_".rand(10000000).".tex"; + unless ($temp_file = Apache::File->new('>'.$filename)) { + $r->log_error("Couldn't open $filename for output $!"); + return SERVER_ERROR; + } + print $temp_file $result; + +# +$r->print(< + + +FINALEND +} + + + sub handler { my $r = shift; + my $helper; # A hook for me to work without disturbing Alex. - if ($ENV{'form.jeremy'}) { - printWizard($r); - return OK; - } + if (!$ENV{'form.jeremy'}) { + my $result = printHelper($r); + if (!ref($result)) { + return $result; + } + $helper = $result; + + + + my $key; + foreach $key (keys %{$helper->{'VARS'}}) { + $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-
'); + } +# return OK; + + + &output_data_new($r,$helper); + + + - my $loaderror=&Apache::lonnet::overloaderror($r); - if ($loaderror) { return $loaderror; } - $loaderror= - &Apache::lonnet::overloaderror($r, - $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); - if ($loaderror) { return $loaderror; } + + + return OK; + } +# my $loaderror=&Apache::lonnet::overloaderror($r); +# if ($loaderror) { return $loaderror; } +# $loaderror= +# &Apache::lonnet::overloaderror($r, +# $ENV{'course.'.$ENV{'request.course.id'}.'.home'}); +# if ($loaderror) { return $loaderror; } $r->content_type('text/html'); $r->send_http_header; @@ -1281,9 +1655,9 @@ sub handler { } -use Apache::lonwizard; +use Apache::lonhelper; -sub printWizard { +sub printHelper { my $r = shift; if ($ENV{'request.course.id'}) { @@ -1311,73 +1685,241 @@ sub printWizard { $r->send_http_header; $r->rflush(); - my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu; - if (!$resourceTitle) { # if the resource doesn't have a title, use the filename - my $url = $ENV{'form.postdata'}; - $resourceTitle = substr($url, rindex($url, '/') + 1); + # Unfortunately, this helper is so complicated we have to + # write it by hand + + Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING}); + + my $helper = Apache::lonhelper::helper->new("Printing Wizard"); + $helper->declareVar('symb'); + $helper->declareVar('postdata'); + $helper->declareVar('filename'); + $helper->declareVar('construction'); + + # This will persistently load in the data we want from the + # very first screen. + # Detect whether we're coming from construction space + if ($ENV{'form.postdata'} =~ /http:\/\// ) { + $ENV{'form.postdata'} =~ /http:\/\/[a-zA-Z.]+\/~([a-zA-Z0-9]+)\/(.*)/; + $helper->{VARS}->{'filename'} = "/home/$1/public_html/$2"; + $helper->{VARS}->{'construction'} = 1; + } else { + if ($ENV{'form.postdata'}) { + $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($ENV{'form.postdata'}); + } + if ($ENV{'form.symb'}) { + $helper->{VARS}->{'symb'} = $ENV{'form.symb'}; + } + if ($ENV{'form.url'}) { + $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'}); + } + } + + if ($ENV{'form.symb'}) { + $helper->{VARS}->{'symb'} = $ENV{'form.symb'}; } + if ($ENV{'form.url'}) { + $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'}); - my $wizard = Apache::lonwizard->new("Printing Wizard", $ENV{QUERY_STRING}); - # PRINT_TYPE: What the user wants to print (current docs, - # whole sequence, etc. - $wizard->declareVars(['PRINT_TYPE', 'FORMAT', 'postdata', 'url', - 'symb', 'RESOURCES', 'FILES', 'STUDENTS']); + } + + my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu; + $helper->{VARS}->{'assignment'} = $sequenceTitle; + # Extract map - my $symb = $wizard->{VARS}->{'symb'}; - my ($map, $id, $url) = split(/__/, $symb); + my $symb = $helper->{VARS}->{'symb'}; + my ($map, $id, $url); + my $subdir; + + # Get the resource name from construction space + if ($helper->{VARS}->{'construction'}) { + $resourceTitle = substr($helper->{VARS}->{'filename'}, + rindex($helper->{VARS}->{'filename'}, '/')+1); + $subdir = substr($helper->{VARS}->{'filename'}, + 0, rindex($helper->{VARS}->{'filename'}, '/') + 1); + } else { + ($map, $id, $url) = split(/___/, $symb); + $helper->{VARS}->{'postdata'} = Apache::lonnet::clutter($url); + + if (!$resourceTitle) { # if the resource doesn't have a title, use the filename + my $url = $helper->{VARS}->{'postdata'}; + $resourceTitle = substr($url, rindex($url, '/') + 1); + } + $subdir = &Apache::lonnet::filelocation("", $url); + } - my $subdir = &Apache::lonnet::filelocation("", $ENV{'form.url'}); + Apache::lonhelper::registerHelperTags(); # "Delete everything after the last slash." $subdir =~ s|/[^/]+$||; + if (not $helper->{VARS}->{'construction'}) { + $subdir='/home/httpd/html/res/'.$subdir; + } - # This really ought to be in some repository in loncommon or - # something where it can just be grabbed. - my $problemFilter = sub { - my $name = shift; - return $name =~ m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/; - }; # What can be printed is a very dynamic decision based on # lots of factors. So we need to dynamically build this list. # To prevent security leaks, states are only added to the wizard - # if they can be reached, which ensures manipulating the querystring + # if they can be reached, which ensures manipulating the form input # won't allow anyone to reach states they shouldn't have permission # to reach. - my $printChoices = []; - # We can always print the current screen. - push @{$printChoices}, ['current_document', "$resourceTitle (exactly what was on the screen)", 'CHOOSE_FORMAT']; - if ($ENV{'form.postdata'}=~ /\/res\//) { - # Allow problems from sequence - push @{$printChoices}, ['map_problems', "Problems from $sequenceTitle", 'CHOOSE_PROBLEMS']; - Apache::lonwizard::resource_multichoice->new($wizard, "CHOOSE_PROBLEMS", 'Select Problems', "Select problems to print from $sequenceTitle:", 'CHOOSE_FORMAT', 'RESOURCES', sub {my $res = shift; return $res->is_problem()}, undef, $map); + # printChoices is tracking the kind of printing the user can + # do, and will be used in a choices construction later. + # In the meantime we will be adding states and elements to + # the helper by hand. + my $printChoices = []; + my $paramHash; + + if ($resourceTitle) { + push @{$printChoices}, ["$resourceTitle (prints what you just saw on the screen)", 'current_document', 'PAGESIZE']; + } + $r->print($helper->{VARS}->{'postdata'}); + + # If we're in a sequence... + if ($helper->{'VARS'}->{'construction'} ne '1') { + # Allow problems from sequence + push @{$printChoices}, ["Problem(s) from $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS']; # Allow all resources from sequence - push @{$printChoices}, ['map_problems_pages', "Problems and pages from $sequenceTitle", 'CHOOSE_PROBLEMS_HTML']; - Apache::lonwizard::resource_multichoice->new($wizard, "CHOOSE_PROBLEMS_HTML", 'Select Resources', "Select resources to print from $sequenceTitle:", "CHOOSE_FORMAT", 'RESOURCES', sub {my $res = shift; return !$res->is_map()}, undef, $map); + push @{$printChoices}, ["Everything (problem(s), page(s), html/xml file(s)) from $sequenceTitle", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML']; + + my $isProblem = '$res->is_problem();'; + my $isProblemOrMap = '$res->is_problem() || $res->is_map()'; + my $isNotMap = '!$res->is_map();'; + my $symb = '$res->symb();'; + my $helperFragment = < + (mark them then click "next" button)
+ + PAGESIZE + return $isProblem + $map + return $symb + + + + + (mark them then click "next" button)
+ + PAGESIZE + return $isNotMap; + $map + return $symb + + +HELPERFRAGMENT + + &Apache::lonxml::xmlparse($r, 'helper', $helperFragment); } # If the user is priviledged, allow them to print all # problems in the course, optionally for selected students - if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($ENV{'form.postdata'}=~/\/res\//)) { - push @{$printChoices}, ['all_problems', 'All problems in course (may take a lot of time)', 'CHOOSE_FORMAT']; - push @{$printChoices}, ['problems_for_students', "Problems from $sequenceTitle for selected students", 'CHOOSE_STUDENTS']; - Apache::lonwizard::choose_student->new($wizard, "CHOOSE_STUDENTS", "Choose Students", "Select the students you wish to print the problems for:", 'CHOOSE_FORMAT', 'STUDENTS', 1); + if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($helper->{VARS}->{'postdata'}=~/\/res\//)) { + push @{$printChoices}, ['Problems in this course', 'all_problems', 'ALL_PROBLEMS']; + push @{$printChoices}, ["Problems from $sequenceTitle for selected students", 'problems_for_students', 'CHOOSE_STUDENTS']; + + my $isProblem = '$res->is_problem();'; + my $isProblemOrMap = '$res->is_problem() || $res->is_map()'; + my $symb = '$res->symb();'; + &Apache::lonxml::xmlparse($r, 'helper', < + (mark them then click "next" button)
+ + PAGESIZE + return $isProblemOrMap + return $isProblem + return $symb + + + + + (do not forget to select assignment itself - make another selection below)
+ +
Select resources for the assignment
 + + return $isProblem + $map + return $symb + +
How should the results be printed?
 + + Print students assignments without separations (as uniform flow) + Start student assignment from new page (add pagefeed after each student) + Add one emty page after each student assignment + Add two emty page after each student assignment + + +CHOOSE_STUDENTS } # FIXME: That RE should come from a library somewhere. - if ((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($ENV{'form.postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) { - push @{$printChoices}, ['problems_from_directory', "Problems from $subdir", 'CHOOSE_FROM_SUBDIR']; - Apache::lonwizard::choose_files->new($wizard, "CHOOSE_FROM_SUBDIR", "Select Files","Select problems you wish to print from $subdir:", 'CHOOSE_FORMAT', 'FILES', $subdir, $problemFilter); - } + if (((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) { + push @{$printChoices}, ["Problems from current subdirectory $subdir", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR']; + + my $f = '$filename'; + my $xmlfrag = < + (mark them then click "next" button)
+ + PAGESIZE + return '$subdir'; +CHOOSE_FROM_SUBDIR + + $xmlfrag .= <<'CHOOSE_FROM_SUBDIR'; + return $filename =~ + m/^[^\.]+\.(problem|exam|quiz|assess|survey|form|library)$/; + + + +CHOOSE_FROM_SUBDIR + &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag); + } + + # Generate the first state, to select which resources get printed. + Apache::lonhelper::state->new("START", "What do you want to print? Make a choice."); + $paramHash = Apache::lonhelper::getParamHash(); + $paramHash->{MESSAGE_TEXT} = ""; + Apache::lonhelper::message->new(); + $paramHash = Apache::lonhelper::getParamHash(); + $paramHash->{'variable'} = 'PRINT_TYPE'; + $helper->declareVar('PRINT_TYPE'); + $paramHash->{CHOICES} = $printChoices; + Apache::lonhelper::choices->new(); + + if ($ENV{'request.role.adv'}) { + $paramHash = Apache::lonhelper::getParamHash(); + $paramHash->{MESSAGE_TEXT} = "
Next option is available only for advanced users:
"; + Apache::lonhelper::message->new(); + $paramHash = Apache::lonhelper::getParamHash(); + $paramHash->{'variable'} = 'ANSWER_TYPE'; + $helper->declareVar('ANSWER_TYPE'); + $paramHash->{CHOICES} = [ + ['Print without answer', 'yes'], + ['Print with answers', 'no'] ]; + Apache::lonhelper::choices->new(); + } + + Apache::lonprintout::page_format_state->new("FORMAT"); + + # Generate the PAGESIZE state which will offer the user the margin + # choices if they select one column + Apache::lonhelper::state->new("PAGESIZE", "Set Margins"); + Apache::lonprintout::page_size_state->new('pagesize', 'FORMAT', 'FINAL'); + + + $helper->process(); + + # MANUAL BAILOUT CONDITION: + # If we're in the "final" state, bailout and return to handler + if ($helper->{STATE} eq 'FINAL') { + return $helper; + } - # Despite the appearance of states before here, this is the first state. - Apache::lonwizard::switch_state->new($wizard, "START", "Selecting Resources to Print", "PRINT_TYPE", $printChoices, "What do you want to print?"); - Apache::lonprintout::page_format_state->new($wizard, "CHOOSE_FORMAT", "Page Format", "FORMAT"); + $r->print($helper->display()); - $r->print($wizard->display()); + Apache::lonhelper::unregisterHelperTags(); untie %hash; @@ -1391,24 +1933,31 @@ package Apache::lonprintout::page_format =pod -=head1 Wizard state: page_format_state +=head1 Helper element: page_format_state + +See lonhelper.pm documentation for discussion of the helper framework. -See lonwizard.pm documentation for discussion of the wizard framework. +Apache::lonprintout::page_format_state is an element that gives the +user an opportunity to select the page layout they wish to print +with: Number of columns, portrait/landscape, and paper size. If you +want to change the paper size choices, change the @paperSize array +contents in this package. -Apache::lonprintout::page_format_state is a state that gives the user an opportunity to select the page layout they wish to print with: Number of columns, portrait/landscape, and paper size. If you want to change the paper size choices, change the @paperSize array contents in this package. +page_format_state is always directly invoked in lonprintout.pm, so there +is no tag interface. You actually pass parameters to the constructor. =over 4 -=item * B(parentLonWizReference, stateName, stateTitle, varName, nextState): varName is where the print information will be stored in the format FIXME. nextState is the state that follows this one. +=item * B(varName): varName is where the print information will be stored in the format FIXME. =back =cut -use Apache::lonwizard; +use Apache::lonhelper; no strict; -@ISA = ("Apache::lonwizard::state"); +@ISA = ("Apache::lonhelper::element"); use strict; my $maxColumns = 2; @@ -1421,48 +1970,44 @@ my @paperSize = ("Letter [8 1/2x11 in]", # Paper type sub new { - my $proto = shift; - my $class = ref($proto) || $proto; - my $self = bless $proto->SUPER::new(shift, shift, shift); + my $self = Apache::lonhelper::element->new(); - $self->{VAR_NAME} = shift; - $self->{NEXT_STATE} = shift; + shift; + + $self->{'variable'} = shift; + my $helper = Apache::lonhelper::getHelper(); + $helper->declareVar($self->{'variable'}); + bless($self); return $self; } sub render { my $self = shift; - my $wizard = $self->{WIZARD}; + my $helper = Apache::lonhelper::getHelper(); my $result = ''; - my $var = $self->{VAR_NAME}; - my $curVal = $self->{WIZARD}->{VARS}->{$var}; - - my ($layout, $cols, $paper) = split(/\|/, $curVal); - - my $landscapeChecked = ($layout ne "L")? '' : 'checked '; - my $portraitChecked = $landscapeChecked ? '' : 'checked '; + my $var = $self->{'variable'}; $result .= <How should the printing be formatted?

+

What page format do you prefer?

- - + + -
LayoutColumnsPage layoutNumber of columns Paper type
- Landscape
- Portrait + Landscape
+ Portrait 		+
"; - $result .= ''; return $result; } +sub postprocess { + my $self = shift; + + my $var = $self->{'variable'}; + my $helper = Apache::lonhelper->getHelper(); + $helper->{VARS}->{$var} = + $ENV{"form.$var.layout"} . '|' . $ENV{"form.$var.cols"} . '|' . + $ENV{"form.$var.paper"}; + return 1; +} + 1; +package Apache::lonprintout::page_size_state; + +=pod + +=head1 Helper element: page_size_state + +See lonhelper.pm documentation for discussion of the helper framework. + +Apache::lonprintout::page_size_state is an element that gives the +user the opportunity to further refine the page settings if they +select a single-column page. + +page_size_state is always directly invoked in lonprintout.pm, so there +is no tag interface. You actually pass parameters to the constructor. + +=over 4 + +=item * B(varName): varName is where the print information will be stored in the format FIXME. + +=back + +=cut + +use Apache::lonhelper; + +no strict; +@ISA = ("Apache::lonhelper::element"); +use strict; + + + +sub new { + my $self = Apache::lonhelper::element->new(); + + shift; # disturbs me (probably prevents subclassing) but works (drops + # package descriptor)... - Jeremy + + $self->{'variable'} = shift; + my $helper = Apache::lonhelper::getHelper(); + $helper->declareVar($self->{'variable'}); + + # The variable name of the format element, so we can look into + # $helper->{VARS} to figure out whether the columns are one or two + $self->{'formatvar'} = shift; + + # The state to transition to after selection, or after discovering + # the cols are not set to 1 + $self->{NEXTSTATE} = shift; + bless($self); + return $self; +} + +sub render { + my $self = shift; + my $helper = Apache::lonhelper::getHelper(); + my $result = ''; + my $var = $self->{'variable'}; + + if (defined $self->{ERROR_MSG}) { + $result .= '
' . $self->{ERROR_MSG} . '
'; + } + + $result .= <How should the column be formatted?

+ + + + + + + + + + + + + + + + + +
Width: + +
Height: + +
Left margin: + +
+ +

Hint: Some instructors like to leave scratch space for the student by +making the width much smaller then the width of the page.

+ +ELEMENTHTML + + return $result; +} + +# If the user didn't select 1 column, skip this state. +sub preprocess { + my $self = shift; + my $helper = Apache::lonhelper::getHelper(); + + my $format = $helper->{VARS}->{$self->{'formatvar'}}; + if (substr($format, 2, 1) ne '1') { + $helper->changeState($self->{NEXTSTATE}); + } + + return 1; +} + +sub postprocess { + my $self = shift; + + my $var = $self->{'variable'}; + my $helper = Apache::lonhelper->getHelper(); + my $width = $helper->{VARS}->{$var .'.width'} = $ENV{"form.${var}.width"}; + my $height = $helper->{VARS}->{$var .'.height'} = $ENV{"form.${var}.height"}; + my $lmargin = $helper->{VARS}->{$var .'.lmargin'} = $ENV{"form.${var}.lmargin"}; + $helper->{VARS}->{$var .'.widthunit'} = $ENV{"form.${var}.widthunit"}; + $helper->{VARS}->{$var .'.heightunit'} = $ENV{"form.${var}.heightunit"}; + $helper->{VARS}->{$var .'.lmarginunit'} = $ENV{"form.${var}.lmarginunit"}; + + my $error = ''; + + # /^-?[0-9]+(\.[0-9]*)?$/ -> optional minus, at least on digit, followed + # by an optional period, followed by digits, ending the string + + if ($width !~ /^-?[0-9]+(\.[0-9]*)?$/) { + $error .= "Invalid width; please type only a number.
\n"; + } + if ($height !~ /^-?[0-9]+(\.[0-9]*)?$/) { + $error .= "Invalid height; please type only a number.
\n"; + } + if ($lmargin !~ /^-?[0-9]+(\.[0-9]*)?$/) { + $error .= "Invalid left margin; please type only a number.
\n"; + } + + if (!$error) { + Apache::lonhelper::getHelper()->changeState($self->{NEXTSTATE}); + return 1; + } else { + $self->{ERROR_MSG} = $error; + return 0; + } +} + + + __END__