--- loncom/interface/lonprintout.pm 2003/04/21 17:53:10 1.130
+++ loncom/interface/lonprintout.pm 2003/05/13 15:28:32 1.164
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.130 2003/04/21 17:53:10 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.164 2003/05/13 15:28:32 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -100,11 +100,6 @@ ENDMENUOUT1
Problem(s) plus page(s) or html/xml file(s) from $title_for_sequence
ENDMENUOUT2
}
- if ($ENV{'request.role.adv'}) {
- $r->print(<
-ENDMENUOUT27
- }
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(<
@@ -509,8 +504,7 @@ ENDPART
$result.=' \end{document}'
}
} elsif ($choice eq 'Standard LaTeX output for the primary sequence' or
- $choice eq 'Standard LaTeX output for whole primary sequence' or
- $choice eq 'Standard LaTeX output for the primary sequence with answers') {
+ $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 @master_seq = ();
@@ -532,11 +526,10 @@ ENDPART
my %moreenv;
$moreenv{'form.grade_target'}='tex';
$moreenv{'form.textwidth'}=$LaTeXwidth;
- if ($choice eq 'Standard LaTeX output for the primary sequence with answers') {$moreenv{'form.texaward'}='SHOW_ANSWER';}
&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','form.texaward');
+ &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;}
@@ -917,7 +910,7 @@ sub character_chart {
$result =~ s/&\#153;/\\texttrademark /g;
$result =~ s/&\#156;/\\oe/g;
$result =~ s/&\#159;/\\\"Y/g;
- $result =~ s/&(\#160|nbsp);?//g;
+ $result =~ s/&(\#160|nbsp);//g;
$result =~ s/&(\#161|iexcl);/!\`/g;
$result =~ s/&(\#162|cent);/\\textcent /g;
$result =~ s/&(\#163|pound);/\\pounds /g;
@@ -1113,7 +1106,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 {
@@ -1155,6 +1227,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;
@@ -1225,73 +1327,8 @@ sub latex_corrections {
}
-sub handler {
-
- my $r = shift;
-
- # A hook for me to work without disturbing Alex.
- if ($ENV{'form.jeremy'}) {
- printWizard($r);
- 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;
- $r->print(&Apache::loncommon::bodytag("Printing"));
-
- if ($ENV{'request.course.id'}) {
- my $fn=$ENV{'request.course.fn'};
- tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640);
- }
-
-#-- start form
- &headerform($r);
-#-- menu for output
- unless ($ENV{'form.phase'}) {
- &menu_for_output($r);
- }
-#-- additional menu for class printing
- if ($ENV{'form.phase'} eq 'two') {
- 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 'Standard LaTeX output for the primary sequence with answers') {
- &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);
- } else {
- $ENV{'form.phase'} = 'three';
- }
- }
-#-- additional menu for page layout (one column case)
- if ($ENV{'form.phase'} eq 'three') {
- if($ENV{'form.numberofcolumns'} == 1) {
- &additional_print_menu($r);
- } else {
- $ENV{'form.phase'} = 'four';
- }
- }
-#-- core part
- if ($ENV{'form.phase'} eq 'four') {
- &output_data($r);
- }
- untie %hash;
- return OK;
-
-}
-
-sub new_output_data {
- my $r = shift;
+sub output_data_new {
+ my ($r,$helper) = @_;
$r->print(<
ENDPART
- my $choice = $ENV{'form.PRINT_TYPE'};
- my $layout = $ENV{'form.FORMAT.layout'};
- my $numberofcolumns = $ENV{'form.FORMAT.cols'};
- my $papersize = $ENV{'form.FORMAT.paper'};
- 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 'current_document') && ($ENV{'form.url'}=~m|^/~|)) {
- if ($ENV{'form.FORMAT.layout'} eq '') {$layout = 'CAPA';}
- if ($ENV{'form.FORMAT.paper'} eq '') {$papersize = 'Letter [8 1/2x11 in]';}
- if ($ENV{'form.FORMAT.cols'} eq '') {$numberofcolumns = 2;}
- }
- my $result = '';
+ 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 $selectionmade = '';
- my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
- if ($numberofcolumns == 1) {
- $textwidth=$ENV{'form.width'};
- $textheight=$ENV{'form.height'};
+ 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)/) {
+ if ($textwidth=~/(\d+)\s*cm/) {
$LaTeXwidth = $1*10;
- } elsif ($textwidth=~/(\d+\s*mm)/) {
+ } elsif ($textwidth=~/(\d+)\s*mm/) {
$LaTeXwidth = $1;
+ } elsif ($textwidth=~/(\d+)\s*in/) {
+ $LaTeXwidth = $1*25.4;
}
- if ($choice eq 'current_document') {
- #-- single document - problem, page, html, xml, ...
- $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;
- &Apache::lonnet::appenv(%moreenv);
- my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
- &Apache::lonnet::delenv('form.grade_target','form.textwidth','form.counter');
- $result .= $texversion;
- if ($ENV{'form.url'}=~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 ($choice eq 'Standard LaTeX output for the primary sequence' or
- $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 @master_seq = ();
- for (my $i=0; $i<$ENV{'form.numberoffiles'};$i++) {
- if ($ENV{'form.whatfile'.$i}=~/\S/) {
- push @master_seq,$ENV{'form.whatfile'.$i};
+ $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{'form.grade_target'}='tex';
+ $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');
+ if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ $moreenv{'form.grade_target'}='answer';
+ $moreenv{'form.print_answer'}='yes';
+ &Apache::lonnet::appenv(%moreenv);
+ my $answer=&Apache::lonnet::ssi($currentURL);
+ &Apache::lonnet::delenv('form.grade_target','form.print_answer');
+ my $start=index($answer,'\vskip 0 mm',0);
+ my $finish=rindex $answer,'\vskip 0 mm' ;
+ if ($start!=-1 && $finish!=-1) {$answer=substr($answer,$start,$finish-$start+12);}
+# $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++) {
- my ($urlp,$symb) = split /&&/, $master_seq[$i];
- if ($choice eq 'Standard LaTeX output for the primary sequence') {
- $selectionmade = 2;
- } elsif ($choice eq 'Standard LaTeX output for whole primary sequence') {
- $selectionmade = 3;
+ $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 %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';
+ my %moreenv;
+ $moreenv{'form.grade_target'}='tex';
+ $moreenv{'form.textwidth'}=$LaTeXwidth;
+ &Apache::lonnet::appenv(%moreenv);
+ #&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');
+ 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 ($choice eq 'Standard LaTeX output for the top level sequence') {
- # where is the main sequence of the course?
- $selectionmade = 4;
- my $main_seq=&Apache::lonnet::clutter($ENV{'request.course.uri'});
- my @file_seq = &coming_from_hash($main_seq);
- for (my $i=0;$i<=$#file_seq;$i++) {
- my ($path,$title,$symb) = split /&&/,$file_seq[$i];
- $file_seq[$i] = $path.'&&'.$symb;
- }
- my $flag_latex_header_remove = 'NO';
- #-- produce an output string
- for (my $i=0;$i<=$#file_seq;$i++) {
- if (not $file_seq[$i]=~/^&&/) {
- 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');
- 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 ($choice eq 'All class print') {
- #-- prints assignments for whole class or for selected students
- $selectionmade = 5;
- my @students = ();
- for (my $i=0; $i<$ENV{'form.numberofstudents'};$i++) {
- if ($ENV{'form.whomtoprint'.$i}=~/:/) {
- push @students,$ENV{'form.whomtoprint'.$i};
- }
- }
- #where is the primary sequence containing current resource (the same for all students)?
- my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
- my @sequence = split('___',$symbolic);
- my $primary_sequence;
-
- $primary_sequence=&Apache::lonnet::clutter($sequence[0]);
- my @master_seq = &coming_from_hash($primary_sequence);
- for (my $i=0;$i<=$#master_seq;$i++) {
- my ($path,$title,$symb) = split /&&/,$master_seq[$i];
- $master_seq[$i] = $path.'&&'.$symb;
- }
- #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) {
+ } 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 ($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) {
- my ($curres,$symb) = split /&&/, $curresline;
- if ($curres=~ m/\.(problem|exam|quiz|assess|survey|form|library)/) {
- my ($map,$id,$res_url) = split(/___/,$symb);
+ 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($symb,$username,$userdomain,
+ 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);
@@ -1488,7 +1485,7 @@ ENDPART
$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<$ENV{'form.addedpages'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
+ 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;
@@ -1500,15 +1497,11 @@ ENDPART
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$result .= '\end{document}';
&Apache::lonnet::delenv('form.textwidth');
- } elsif ($choice eq 'Subdirectory print') {
+ } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_from_directory') {
#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 @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];
@@ -1556,18 +1549,18 @@ ENDPART
$result .= '\end{document}';
}
#-------------------------------------------------------- corrections for the different page formats
- $result = &page_format_transformation($papersize,$layout,$numberofcolumns,$choice,$result,$assignment);
- if ($layout eq 'CBI') {
- $laystyle = 'album';
- }
+ $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'}/;
- }
+# #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";
@@ -1576,6 +1569,8 @@ ENDPART
return SERVER_ERROR;
}
print $temp_file $result;
+
+#
$r->print(<
');
+ }
+# return OK;
+
+
+ &output_data_new($r,$helper);
+
+
+
+
+
+
+ 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;
+ $r->print(&Apache::loncommon::bodytag("Printing"));
+
+ if ($ENV{'request.course.id'}) {
+ my $fn=$ENV{'request.course.fn'};
+ tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640);
+ }
+
+#-- start form
+ &headerform($r);
+#-- menu for output
+ unless ($ENV{'form.phase'}) {
+ &menu_for_output($r);
+ }
+#-- additional menu for class printing
+ if ($ENV{'form.phase'} eq 'two') {
+ 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);
+ } else {
+ $ENV{'form.phase'} = 'three';
+ }
+ }
+#-- additional menu for page layout (one column case)
+ if ($ENV{'form.phase'} eq 'three') {
+ if($ENV{'form.numberofcolumns'} == 1) {
+ &additional_print_menu($r);
+ } else {
+ $ENV{'form.phase'} = 'four';
+ }
+ }
+#-- core part
+ if ($ENV{'form.phase'} eq 'four') {
+ &output_data($r);
+ }
+ untie %hash;
+ return OK;
+
+}
-use Apache::lonwizard;
+use Apache::lonhelper;
-sub printWizard {
+sub printHelper {
my $r = shift;
if ($ENV{'request.course.id'}) {
- my $fn=$ENV{'request.course.fn'};
- tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640);
+ my $fn=$ENV{'request.course.fn'};
+ tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640);
}
if ($r->header_only) {
- if ($ENV{'browser.mathml'}) {
- $r->content_type('text/xml');
- } else {
- $r->content_type('text/html');
- }
- $r->send_http_header;
- return OK;
+ if ($ENV{'browser.mathml'}) {
+ $r->content_type('text/xml');
+ } else {
+ $r->content_type('text/html');
+ }
+ $r->send_http_header;
+ return OK;
}
+ # Send header, nocache
if ($ENV{'browser.mathml'}) {
- $r->content_type('text/xml');
+ $r->content_type('text/xml');
} else {
- $r->content_type('text/html');
+ $r->content_type('text/html');
}
&Apache::loncommon::no_cache($r);
$r->send_http_header;
$r->rflush();
- my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
- #if the resource doesn't have a title, use the filename
- if (!$resourceTitle) {
- 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'});
+ }
}
- my $wizard = Apache::lonwizard->new("Printing Wizard", $ENV{QUERY_STRING});
+ if ($ENV{'form.symb'}) {
+ $helper->{VARS}->{'symb'} = $ENV{'form.symb'};
+ }
+ if ($ENV{'form.url'}) {
+ $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
- $wizard->declareVars(['PRINT_TYPE', 'FORMAT', 'url', 'symb', 'postdata' , 'RESOURCES', 'FILES', 'STUDENTS']);
+ }
+
+ my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
+ $helper->{VARS}->{'assignment'} = $sequenceTitle;
- $wizard->{VARS}->{'postdata'} = $ENV{'form.postdata'};
- $wizard->{VARS}->{'url'} = $ENV{'form.postdata'};
- $wizard->{VARS}->{'symb'} = &Apache::lonnet::symbread($ENV{'form.postdata'});
+
+ # Extract map
+ 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);
- my $subdir = &Apache::lonnet::filelocation("", $ENV{'form.postdata'});
- $subdir =~ s|/[^/]+$||;
+ 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 $symb = $wizard->{VARS}->{'symb'}; # Extract map
- my ($map, $id, $url) = split(/__/, $symb);
+ 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 won't allow anyone to reach states they shouldn't have permission to reach.
+ # 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 form input
+ # won't allow anyone to reach states they shouldn't have permission
+ # to reach.
- my $printChoices = [];
+ # 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;
- # We can always print the current screen.
- push @{$printChoices}, ['current_document', "Current resource \"$resourceTitle\" (prints what you just saw on the screen)", 'CHOOSE_FORMAT'];
+ if ($resourceTitle) {
+ push @{$printChoices}, ["$resourceTitle (prints what you just saw on the screen)", 'current_document', 'PAGESIZE'];
+ }
- 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);
+ $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', "Problem(s) and page(s) or html/xml file(s) 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 = <
Select resources for the assignment
How should the results be printed?
$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);
- }
-
-
-
-
- # Despite the appearance of states before here, this is the first state.
- Apache::lonwizard::switch_state->new($wizard, "START", "What do you want to print? Make a choice.", "PRINT_TYPE", $printChoices, "", "");
-
-
-
-
-
-
-
- Apache::lonprintout::page_format_state->new($wizard, "CHOOSE_FORMAT", "You can change page layout parameters here.", "FORMAT");
+ 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 = <
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');
- if ($ENV{'form.printWizDone'} ne 1) {
- $r->print($wizard->display());
- } else {
- &new_output_data($r);
- }
+ $helper->process();
+ # MANUAL BAILOUT CONDITION:
+ # If we're in the "final" state, bailout and return to handler
+ if ($helper->{STATE} eq 'FINAL') {
+ return $helper;
+ }
+ $r->print($helper->display());
+ Apache::lonhelper::unregisterHelperTags();
untie %hash;
-
return OK;
}
@@ -1717,24 +1942,31 @@ package Apache::lonprintout::page_format
=pod
-=head1 Wizard state: page_format_state
+=head1 Helper element: page_format_state
-See lonwizard.pm documentation for discussion of the wizard framework.
+See lonhelper.pm documentation for discussion of the helper framework.
-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.
+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.
+
+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
What page format do you prefer?
Orientation | -Number of Columns | -Paper size ([width x height]) | +Page layout | +Number of columns | +Paper type |
- Landscape - Portrait + Landscape + Portrait |
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.