--- loncom/interface/lonprintout.pm 2004/07/14 14:15:56 1.314
+++ loncom/interface/lonprintout.pm 2005/04/07 06:56:23 1.373
@@ -1,7 +1,7 @@
-# The LearningOnline Network
+# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.314 2004/07/14 14:15:56 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.373 2005/04/07 06:56:23 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -41,12 +41,64 @@ use Apache::lonnavmaps;
use Apache::lonratedt;
use POSIX qw(strftime);
use Apache::lonlocal;
-use GDBM_File;
+# Compare two students by name. The students are in the form
+# returned by the helper:
+# user:domain:section:last, first:status
+# This is a helper function for the perl sort built-in therefore:
+# Implicit Inputs:
+# $a - The first element to compare (global)
+# $b - The second element to compare (global)
+# Returns:
+# -1 - $a < $b
+# 0 - $a == $b
+# +1 - $a > $b
+# Note that the initial comparison is done on the last names with the
+# first names only used to break the tie.
+#
+#
+sub compare_names {
+ # First split the names up into the primary fields.
+
+ my ($u1, $d1, $s1, $n1, $stat1) = split(/:/, $a);
+ my ($u2, $d2, $s2, $n2, $stat2) = split(/:/, $b);
+
+ # Now split the last name and first name of each n:
+ #
+
+ my ($l1,$f1) = split(/,/, $n1);
+ my ($l2,$f2) = split(/,/, $n2);
-my %hash;
-my $LaTeXwidth = 0;
+ # We don't bother to remove the leading/trailing whitespace from the
+ # firstname, unless the last names compare identical.
+ if($l1 lt $l2) {
+ return -1;
+ }
+ if($l1 gt $l2) {
+ return 1;
+ }
+
+ # Break the tie on the first name, but there are leading (possibly trailing
+ # whitespaces to get rid of first
+ #
+ $f1 =~ s/^\s+//; # Remove leading...
+ $f1 =~ s/\s+$//; # Trailing spaces from first 1...
+
+ $f2 =~ s/^\s+//;
+ $f2 =~ s/\s+$//; # And the same for first 2...
+
+ if($f1 lt $f2) {
+ return -1;
+ }
+ if($f1 gt $f2) {
+ return 1;
+ }
+
+ # Must be the same name.
+
+ return 0;
+}
sub latex_header_footer_remove {
my $text = shift;
@@ -229,7 +281,7 @@ sub character_chart {
$result =~ s/&(\#219|Ucirc);/\\^{U}/g;
$result =~ s/&(\#220|Uuml);/\\\"{U}/g;
$result =~ s/&(\#221|Yacute);/\\\'{Y}/g;
- $result =~ s/&(\#223|szlig);/\\ss/g;
+ $result =~ s/&(\#223|szlig);/{\\ss}/g;
$result =~ s/&(\#224|agrave);/\\\`{a}/g;
$result =~ s/&(\#225|aacute);/\\\'{a}/g;
$result =~ s/&(\#226|acirc);/\\^{a}/g;
@@ -373,90 +425,117 @@ sub character_chart {
}
+ #width, height, oddsidemargin, evensidemargin, topmargin
+my %page_formats=
+ ('letter' => {
+ 'book' => {
+ '1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm'],
+ '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.7 cm']
+ },
+ 'album' => {
+ '1' => [ '8.8 in', '6.8 in','-40 pt in', '-60 pt','1 cm'],
+ '2' => [ '4.4 in', '6.8 in','-0.5 in', '-1.5 in','3.5 in']
+ },
+ },
+ 'legal' => {
+ 'book' => {
+ '1' => ['7.1 in','13 in',,'-0.57 in','-0.57 in','-0.5 in'],
+ '2' => ['3.16 in','13 in','-0.57 in','-0.57 in','-0.5 in']
+ },
+ 'album' => {
+ '1' => [],
+ '2' => []
+ },
+ },
+ 'tabloid' => {
+ 'book' => {
+ '1' => ['9.8 in','16 in','-0.57 in','-0.57 in','-0.5 in'],
+ '2' => ['4.9 in','16 in','-0.57 in','-0.57 in','-0.5 in']
+ },
+ 'album' => {
+ '1' => [],
+ '2' => []
+ },
+ },
+ 'executive' => {
+ 'book' => {
+ '1' => ['6.8 in','9 in','-0.57 in','-0.57 in','1.2 in'],
+ '2' => ['3.1 in','9 in','-0.57 in','-0.57 in','1.2 in']
+ },
+ 'album' => {
+ '1' => [],
+ '2' => []
+ },
+ },
+ 'a2' => {
+ 'book' => {
+ '1' => [],
+ '2' => []
+ },
+ 'album' => {
+ '1' => [],
+ '2' => []
+ },
+ },
+ 'a3' => {
+ 'book' => {
+ '1' => [],
+ '2' => []
+ },
+ 'album' => {
+ '1' => [],
+ '2' => []
+ },
+ },
+ 'a4' => {
+ 'book' => {
+ '1' => ['176 mm','272 mm','-40 pt in','-60 pt','-0.5 in'],
+ '2' => [ '91 mm','272 mm','-40 pt in','-60 pt','-0.5 in']
+ },
+ 'album' => {
+ '1' => ['8.5 in','7.7 in','-40 pt in','-60 pt','0 in'],
+ '2' => ['3.9 in','7.7 in','-40 pt in','-60 pt','0 in']
+ },
+ },
+ 'a5' => {
+ 'book' => {
+ '1' => [],
+ '2' => []
+ },
+ 'album' => {
+ '1' => [],
+ '2' => []
+ },
+ },
+ 'a6' => {
+ 'book' => {
+ '1' => [],
+ '2' => []
+ },
+ 'album' => {
+ '1' => [],
+ '2' => []
+ },
+ },
+ );
+
sub page_format {
#
-#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]"
+#Supported paper format: "Letter [8 1/2x11 in]", "Legal [8 1/2x14 in]",
+# "Ledger/Tabloid [11x17 in]", "Executive [7 1/2x10 in]",
+# "A2 [420x594 mm]", "A3 [297x420 mm]",
+# "A4 [210x297 mm]", "A5 [148x210 mm]",
+# "A6 [105x148 mm]"
#
my ($papersize,$layout,$numberofcolumns) = @_;
- my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin) = (0,0,0,0,0);
- if ($papersize eq '0') {
- if ($layout eq 'book') {
- if ($numberofcolumns == 1) {
- $textwidth = '7.1 in'; #'18 cm';
- $textheight = '10.2 in'; #'25.9 cm';
- $oddoffset = '-0.57 in';
- $evenoffset = '-0.57 in';
- } elsif ($numberofcolumns == 2) {
- $textwidth = '3.66 in'; #'93 mm';
- $textheight = '10.2 in'; #'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.4 in';
- $textheight = '6.8 in';
- $oddoffset = '-0.5 in';
- $evenoffset = '-1.5 in';
- $topmargin = '3.5 in';
- }
- }
-# } elsif($papersize eq '1') {
-# } elsif($papersize eq '2') {
-# } elsif($papersize eq '3'/) {
- } elsif($papersize eq '6') {
- if ($layout eq 'book') {
- if ($numberofcolumns == 1) {
- $textwidth = '176 mm';
- $textheight = '254 mm';
- $oddoffset = '-0.57 in';
- $evenoffset = '-0.57 in';
- } elsif ($numberofcolumns == 2) {
- $textwidth = '91 mm';
- $textheight = '254 mm';
- $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,$topmargin;
+ return @{$page_formats{$papersize}->{$layout}->{$numberofcolumns}};
}
sub get_name {
my ($uname,$udom)=@_;
- if (!defined($uname)) { $uname=$ENV{'user.name'}; }
- if (!defined($udom)) { $udom=$ENV{'user.domain'}; }
+ if (!defined($uname)) { $uname=$env{'user.name'}; }
+ if (!defined($udom)) { $udom=$env{'user.domain'}; }
my $plainname=&Apache::loncommon::plainname($uname,$udom);
if ($plainname=~/^\s*$/) { $plainname=$uname.'@'.$udom; }
$plainname=&Apache::lonxml::latex_special_symbols($plainname,'header');
@@ -465,8 +544,8 @@ sub get_name {
sub get_course {
my $courseidinfo;
- if (defined($ENV{'request.course.id'})) {
- $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($ENV{'course.'.$ENV{'request.course.id'}.'.description'}),'header');
+ if (defined($env{'request.course.id'})) {
+ $courseidinfo = &Apache::lonxml::latex_special_symbols(&Apache::lonnet::unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
}
return $courseidinfo;
}
@@ -483,15 +562,24 @@ sub page_format_transformation {
my $name = &get_name();
my $courseidinfo = &get_course();
if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
+ my $topmargintoinsert = '';
+ if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
+ my $fancypagestatement='';
+ if ($numberofcolumns eq '2') {
+ $fancypagestatement="\\fancyhead{}\\fancyhead[LO]{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";
+ } else {
+ $fancypagestatement="\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}";
+ }
if ($layout eq 'album') {
- my $topmargintoinsert = '';
- if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
- $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{}\\lhead{\\textbf{$name} $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}} \\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1} /;
+ $text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}$topmargintoinsert\n\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\n\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\n\\pagestyle{fancy}$fancypagestatement\\begin{document}\\voffset=-0\.8 cm\\setcounter{page}{1}\n /;
} 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}/;
+ $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset $topmargintoinsert\n\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\n\\renewcommand{\\ref}{\\keephidden\}\\usepackage{fancyhdr}\\addtolength{\\headheight}{\\baselineskip}\\pagestyle{fancy}$fancypagestatement\\begin{document}\n\\voffset=-0\.8 cm\\setcounter{page}{1}\n/;
} 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 /;
+ $text =~ s/\\pagestyle{fancy}\\rhead{}\\chead{}\s*\\begin{document}/\\textheight = $textheight\\oddsidemargin = $evenoffset\n\\evensidemargin = $evenoffset $topmargintoinsert\\textwidth= $textwidth\\newlength{\\minipagewidth}\n\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\pagestyle{fancy}\\rhead{}\\chead{}\\begin{document}\\voffset=-0\.8cm\n\\setcounter{page}{1} \\vskip 5 mm\n /;
+ }
+ if ($papersize eq 'a4') {
+ $text =~ s/(\\begin{document})/$1\\special{papersize=210mm,297mm}/;
}
}
if ($tableofcontents eq 'yes') {$text=~s/(\\setcounter\{page\}\{1\})/$1 \\tableofcontents\\newpage /;}
@@ -518,9 +606,11 @@ sub page_cleanup {
sub details_for_menu {
-
- my $name_of_resourse = &Apache::lonnet::gettitle($ENV{'form.postdata'});
- my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});
+ my ($helper)=@_;
+ my $postdata=$env{'form.postdata'};
+ if (!$postdata) { $postdata=$helper->{VARS}{'postdata'}; }
+ my $name_of_resource = &Apache::lonnet::gettitle($postdata);
+ my $symbolic = &Apache::lonnet::symbread($postdata);
my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
$map=&Apache::lonnet::clutter($map);
my $name_of_sequence = &Apache::lonnet::gettitle($map);
@@ -528,23 +618,26 @@ sub details_for_menu {
$map =~ m|([^/]+)$|;
$name_of_sequence = $1;
}
- my $name_of_map = &Apache::lonnet::gettitle($ENV{'request.course.uri'});
+ my $name_of_map = &Apache::lonnet::gettitle($env{'request.course.uri'});
if ($name_of_map =~ /^\s*$/) {
- $ENV{'request.course.uri'} =~ m|([^/]+)$|;
+ $env{'request.course.uri'} =~ m|([^/]+)$|;
$name_of_map = $1;
}
- return ($name_of_resourse,$name_of_sequence,$name_of_map);
-
+ return ($name_of_resource,$name_of_sequence,$name_of_map);
}
sub latex_corrections {
- my ($number_of_columns,$result) = @_;
+ my ($number_of_columns,$result,$selectionmade) = @_;
# $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
$result =~ s/\$number_of_columns/$number_of_columns/g;
- $result =~ s/(\\end{document})/\\strut\\vspace\*{-4 mm}\\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 $1/;
+ if ($selectionmade ne '1') {
+ $result =~ s/(\\end{document})/\\strut\\vspace\*{-4 mm}\\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 $1/;
+ } else {
+ $result =~ s/(\\end{document})/\\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 $1/;
+ }
$result =~ s/(\\end{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
$result =~ s/(\\end{longtable}\s*)\\strut\\newline/$1/g;
#-- LaTeX corrections
@@ -602,47 +695,45 @@ sub IndexCreation {
sub print_latex_header {
my $mode=shift;
my $output='\documentclass[letterpaper]{article}';
- if ($mode eq 'batchmode') {
+ if (($mode eq 'batchmode') || (!$env{'request.role.adv'})) {
$output.='\batchmode';
}
- $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'.
- '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'.
- '\usepackage[dvips]{graphicx}\usepackage{epsfig}\usepackage{calc}'.
- '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'.
- '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'.
- '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'.
- '\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}'.
- '\setlength{\abovedisplayshortskip}{-0.04in}'.
- '\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'.
- '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large'.
- '\textbf{Index}} \newline \setlength{\rightmargin}{0in}'.
- '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}'.
- '\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}'.
- '\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}'.
- '\setlength{\abovedisplayshortskip}{-0.04in}'.
- '\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}\begin{document}';
+ $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'."\n".
+ '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'."\n".
+ '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n".
+ '\usepackage{picins}\usepackage{calc}'."\n".
+ '\newenvironment{choicelist}{\begin{list}{}{\setlength{\rightmargin}{0in}'."\n".
+ '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.05in}'."\n".
+ '\setlength{\itemsep}{0.022in}\setlength{\parsep}{0in}'."\n".
+ '\setlength{\belowdisplayskip}{0.04in}\setlength{\abovedisplayskip}{0.05in}'."\n".
+ '\setlength{\abovedisplayshortskip}{-0.04in}'."\n".
+ '\setlength{\belowdisplayshortskip}{0.04in}}}{\end{list}}'."\n".
+ '\renewenvironment{theindex}{\begin{list}{}{{\vskip 1mm \noindent \large'."\n".
+ '\textbf{Index}} \newline \setlength{\rightmargin}{0in}'."\n".
+ '\setlength{\leftmargin}{0.13in}\setlength{\topsep}{0.01in}'."\n".
+ '\setlength{\itemsep}{0.1in}\setlength{\parsep}{-0.02in}'."\n".
+ '\setlength{\belowdisplayskip}{0.01in}\setlength{\abovedisplayskip}{0.01in}'."\n".
+ '\setlength{\abovedisplayshortskip}{-0.04in}'."\n".
+ '\setlength{\belowdisplayshortskip}{0.01in}}}{\end{list}}\begin{document}'."\n";
return $output;
}
sub path_to_problem {
- my ($urlp,$LaTeXwidth)=@_;
+ my ($urlp,$colwidth)=@_;
my $newurlp = '';
- $LaTeXwidth=~s/\s*mm\s*$//;
- 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--;
- }
+ $colwidth=~s/\s*mm\s*$//;
+#characters average about 2 mm in width
+ if (length($urlp)*2 > $colwidth) {
+ my @elements = split '/',$urlp;
+ my $curlength=0;
+ foreach my $element (@elements) {
+ if ($curlength+(length($element)*2) > $colwidth) {
+ $newurlp .= '|\vskip -1 mm \noindent \verb|';
+ $curlength=0;
+ } else {
+ $curlength+=length($element)*2;
}
+ $newurlp.='/'.$element;
}
} else {
$newurlp=$urlp;
@@ -653,11 +744,11 @@ sub path_to_problem {
sub recalcto_mm {
my $textwidth=shift;
my $LaTeXwidth;
- if ($textwidth=~/(\d+\.?\d*)\s*cm/) {
+ if ($textwidth=~/(-?\d+\.?\d*)\s*cm/) {
$LaTeXwidth = $1*10;
- } elsif ($textwidth=~/(\d+\.?\d*)\s*mm/) {
+ } elsif ($textwidth=~/(-?\d+\.?\d*)\s*mm/) {
$LaTeXwidth = $1;
- } elsif ($textwidth=~/(\d+\.?\d*)\s*in/) {
+ } elsif ($textwidth=~/(-?\d+\.?\d*)\s*in/) {
$LaTeXwidth = $1*25.4;
}
$LaTeXwidth.=' mm';
@@ -690,13 +781,36 @@ sub unsupported {
}
+#
+# Retrieve the hash of page breaks.
+#
+# Inputs:
+# helper - reference to helper object.
+# Outputs
+# A reference to a page break hash.
+#
+#
+
+sub get_page_breaks {
+ my ($helper) = @_;
+ my %page_breaks;
+
+ foreach my $break (split /\|\|\|/, $helper->{'VARS'}->{'FINISHPAGE'}) {
+ $page_breaks{$break} = 1;
+ }
+
+ return %page_breaks;
+}
+
sub output_data {
my ($r,$helper,$rparmhash) = @_;
my %parmhash = %$rparmhash;
+ my $html=&Apache::lonxml::xmlbegin();
my $bodytag=&Apache::loncommon::bodytag('Preparing Printout');
$r->print(<<ENDPART);
-<html>
-<script type="text/javascript" language="Javascript" >
+$html
+<head>
+<script type="text/javascript" language="Javascript">
var editbrowser;
function openbrowser(formname,elementname,only,omit) {
var url = '/res/?';
@@ -720,13 +834,26 @@ sub output_data {
editbrowser.focus();
}
</script>
-<head>
<title>LON-CAPA output for printing</title>
</head>
$bodytag
Please stand by while processing your print request, this may take some time ...
ENDPART
+
+
+ # fetch the pagebreaks and store them in the course environment
+ # The page breaks will be pulled into the hash %page_breaks which is
+ # indexed by symb and contains 1's for each break.
+
+ $env{'form.pagebreaks'} = $helper->{'VARS'}->{'FINISHPAGE'};
+ $env{'form.lastprinttype'} = $helper->{'VARS'}->{'PRINT_TYPE'};
+ &Apache::loncommon::store_course_settings('print',
+ {'pagebreaks' => 'scalar',
+ 'lastprinttype' => 'scalar'});
+
+ my %page_breaks = &get_page_breaks($helper);
+
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
@@ -738,39 +865,58 @@ ENDPART
$laystyle='book';
}
my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);
- my $assignment = $ENV{'form.assignment'};
+ my $assignment = $env{'form.assignment'};
my $LaTeXwidth=&recalcto_mm($textwidth);
my @print_array=();
my @student_names=();
-
+
+ # Common settings for the %form has:
+ # In some cases these settings get overriddent by specific cases, but the
+ # settings are common enough to make it worthwhile factoring them out
+ # here.
+ #
+ my %form;
+ $form{'grade_target'} = 'tex';
+ $form{'textwidth'} = &get_textwidth($helper, $LaTeXwidth);
+
+ # If form.showallfoils is set, then request all foils be shown:
+ # privilege will be enforced both by not allowing the
+ # check box selecting this option to be presnt unless it's ok,
+ # and by lonresponse's priv. check.
+ # The if is here because lonresponse.pm only cares that
+ # showallfoils is defined, not what the value is.
+
+ if ($helper->{'VARS'}->{'showallfoils'} eq "1") {
+ $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};
+ }
+
if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
#-- single document - problem, page, html, xml, ...
- my $currentURL;
+ my ($currentURL,$cleanURL);
if ($helper->{'VARS'}->{'construction'} ne '1') {
#prints published resource
$currentURL=$helper->{'VARS'}->{'postdata'};
+ $cleanURL=&Apache::lonenc::check_decrypt($currentURL);
} else {
#prints resource from the construction space
$currentURL='/'.$helper->{'VARS'}->{'filename'};
if ($currentURL=~/([^?]+)/) {$currentURL=$1;}
+ $cleanURL=$currentURL;
}
$selectionmade = 1;
- if ($currentURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+ if ($cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
my $rndseed=time;
my $texversion='';
if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
my %moreenv;
- $moreenv{'request.filename'}=$currentURL;
+ $moreenv{'request.filename'}=$cleanURL;
if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
$moreenv{'construct.style'}=$helper->{'VARS'}->{'style_file'};
- my $dom = $ENV{'user.domain'};
- my $user = $ENV{'user.name'};
+ my $dom = $env{'user.domain'};
+ my $user = $env{'user.name'};
my $put_result = &Apache::lonnet::put('environment',{'construct.style'=>$helper->{'VARS'}->{'style_file'}},$dom,$user);
}
- my %form;
if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
- $form{'grade_target'}='tex';
- $form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
$form{'problem_split'}=$parmhash{'problem_stream_switch'};
$form{'suppress_tries'}=$parmhash{'suppress_tries'};
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
@@ -789,7 +935,7 @@ ENDPART
}
if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
- my %form;
+ $form{'problem_split'}=$parmhash{'problem_stream_switch'};
$form{'grade_target'}='answer';
$form{'answer_output_mode'}='tex';
$form{'rndseed'}=$rndseed;
@@ -800,10 +946,10 @@ ENDPART
$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
if ($helper->{'VARS'}->{'construction'} ne '1') {
$texversion.='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';
- $texversion.=&path_to_problem ($currentURL,$LaTeXwidth);
+ $texversion.=&path_to_problem($cleanURL,$LaTeXwidth);
} else {
$texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
- my $URLpath=$currentURL;
+ my $URLpath=$cleanURL;
$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
$texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
}
@@ -836,9 +982,6 @@ ENDPART
if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
my $texversion='';
if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
- my %form;
- $form{'grade_target'}='tex';
- $form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
$form{'problem_split'}=$parmhash{'problem_stream_switch'};
$form{'suppress_tries'}=$parmhash{'suppress_tries'};
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
@@ -848,11 +991,11 @@ ENDPART
if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) &&
($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page)$/)) {
- my %form;
$form{'grade_target'}='answer';
$form{'answer_output_mode'}='tex';
$form{'rndseed'}=$rndseed;
- if ($urlp=~/\/res\//) {$ENV{'request.state'}='published';}
+ $form{'problem_split'}=$parmhash{'problem_stream_switch'};
+ if ($urlp=~/\/res\//) {$env{'request.state'}='published';}
my $answer=&Apache::lonnet::ssi($urlp,%form);
if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
@@ -882,10 +1025,7 @@ ENDPART
}
if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
$result .= '\end{document}';
- } elsif ($currentURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
- my %form;
- $form{'grade_target'}='tex';
- $form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
+ } elsif ($cleanURL=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
my $texversion=&Apache::lonnet::ssi($currentURL,%form);
@@ -893,9 +1033,10 @@ ENDPART
} else {
$result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'});
}
- } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or
+ } 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') or
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') or
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources') or # BUGBUG
($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')) {
#-- produce an output string
if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') {
@@ -904,12 +1045,11 @@ ENDPART
$selectionmade = 3;
} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
$selectionmade = 4;
+ } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources') { #BUGBUG
+ $selectionmade = 4;
} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences') {
$selectionmade = 7;
}
- my %form=();
- $form{'grade_target'}='tex';
- $form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
$form{'problem_split'}=$parmhash{'problem_stream_switch'};
$form{'suppress_tries'}=$parmhash{'suppress_tries'};
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
@@ -922,6 +1062,15 @@ ENDPART
&Apache::lonnet::delenv('form.counter');
&Apache::lonxml::init_counter();
for (my $i=0;$i<=$#master_seq;$i++) {
+
+ # Note due to document structure, not allowed to put \newpage
+ # prior to the first resource
+
+ if (defined $page_breaks{$master_seq[$i]}) {
+ if($i != 0) {
+ $result.="\\newpage\n";
+ }
+ }
my (undef,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
$urlp=&Apache::lonnet::clutter($urlp);
$form{'symb'}=$master_seq[$i];
@@ -929,7 +1078,6 @@ ENDPART
my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #tittle of the assignment which contains this problem
if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}
if ($i==0) {$prevassignment=$assignment;}
- #&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
my $texversion='';
if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
$texversion.=&Apache::lonnet::ssi($urlp,%form);
@@ -940,14 +1088,13 @@ ENDPART
$flag_page_in_sequence = 'YES';
}
my $lonidsdir=$r->dir_config('lonIDsDir');
- my $envfile=$ENV{'user.environment'};
+ my $envfile=$env{'user.environment'};
$envfile=~/\/([^\/]+)\.id$/;
$envfile=$1;
&Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile);
- my $current_counter=$ENV{'form.counter'};
+ my $current_counter=$env{'form.counter'};
if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
- my %form;
$form{'grade_target'}='answer';
$form{'answer_output_mode'}='tex';
my $answer=&Apache::lonnet::ssi($urlp,%form);
@@ -978,14 +1125,11 @@ ENDPART
my $courseidinfo = &get_course();
if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
$prevassignment=$assignment;
- $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip -5 mm ';
+ $result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$name.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}} \vskip 5 mm ';
}
$result .= $texversion;
$flag_latex_header_remove = 'YES';
} elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
- my %form;
- $form{'grade_target'}='tex';
- $form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
my $texversion=&Apache::lonnet::ssi($urlp,%form);
@@ -1006,12 +1150,17 @@ ENDPART
$result .= $texversion;
$flag_latex_header_remove = 'YES';
}
+ if (&Apache::loncommon::connection_aborted($r)) { last; }
}
&Apache::lonnet::delenv('form.counter');
- if ($flag_page_in_sequence eq 'YES') {$result =~ s/\\usepackage{calc}/\\usepackage{calc}\\usepackage{longtable}/;}
+ 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') ||
($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students')){
+
+
#-- prints assignments for whole class or for selected students
my $type;
if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') {
@@ -1022,56 +1171,70 @@ ENDPART
$type='resources';
}
my @students=split /\|\|\|/, $helper->{'VARS'}->{'STUDENTS'};
+ # The normal sort order is by section then by students within the
+ # section. If the helper var student_sort is 1, then the user has elected
+ # to override this and output the students by name.
+ # Each element of the students array is of the form:
+ # username:domain:section:last, first:status
+ #
+ #
+ if ($helper->{'VARS'}->{'student_sort'} eq 1) {
+ @students = sort compare_names @students;
+ }
if ($helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq '0' ||
$helper->{'VARS'}->{'NUMBER_TO_PRINT'} eq 'all' ) {
$helper->{'VARS'}->{'NUMBER_TO_PRINT'}=$#students+1;
}
my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+
#loop over students
my $flag_latex_header_remove = 'NO';
my %moreenv;
+ $moreenv{'instructor_comments'}='hide';
$moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
$moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+ $moreenv{'problem_split'} = $parmhash{'problem_stream_switch'};
+ $moreenv{'suppress_tries'} = $parmhash{'suppress_tries'};
if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}
- my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1);
+ my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
my $student_counter=-1;
foreach my $person (@students) {
- my $duefile="/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due";
+
+ my $duefile="/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
if (-e $duefile) {
my $temp_file = Apache::File->new('>>'.$duefile);
print $temp_file "1969\n";
}
$student_counter++;
my $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'});
- my ($output,$fullname)=&print_resources($r,$helper,$person,$type,\%moreenv,\@master_seq,$flag_latex_header_remove);
+ my ($output,$fullname)=&print_resources($r,$helper,
+ $person,$type,
+ \%moreenv,\@master_seq,
+ $flag_latex_header_remove,
+ $LaTeXwidth);
$print_array[$i].=$output;
$student_names[$i].=$person.':'.$fullname.'_END_';
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,&mt('last student').' '.$fullname);
$flag_latex_header_remove = 'YES';
+ if (&Apache::loncommon::connection_aborted($r)) { last; }
}
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$result .= $print_array[0].' \end{document}';
} elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_anon') ||
($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_anon') ) {
- my $cdom =$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
- my $cnum =$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
my $num_todo=$helper->{'VARS'}->{'NUMBER_TO_PRINT_TOTAL'};
my $code_name=$helper->{'VARS'}->{'ANON_CODE_STORAGE_NAME'};
my $old_name=$helper->{'VARS'}->{'REUSE_OLD_CODES'};
- my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
- my ($type) = split(/_/,$helper->{'VARS'}->{'PRINT_TYPE'});
- my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};
- if ($number_per_page eq '0' || $number_per_page eq 'all') {
- $number_per_page=$num_todo;
- }
- my $flag_latex_header_remove = 'NO';
my %moreenv = ('textwidth' => &get_textwidth($helper,$LaTeXwidth));
- my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$num_todo,'inline','75');
+ $moreenv{'problem_split'} = $parmhash{'problem_stream_switch'};
my $seed=time+($$<<16)+($$);
my @allcodes;
if ($old_name) {
my %result=&Apache::lonnet::get('CODEs',[$old_name],$cdom,$cnum);
@allcodes=split(',',$result{$old_name});
+ $num_todo=scalar(@allcodes);
} else {
my %allcodes;
srand($seed);
@@ -1085,18 +1248,28 @@ ENDPART
}
@allcodes=keys(%allcodes);
}
+ my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
+ my ($type) = split(/_/,$helper->{'VARS'}->{'PRINT_TYPE'});
+ my $number_per_page=$helper->{'VARS'}->{'NUMBER_TO_PRINT'};
+ if ($number_per_page eq '0' || $number_per_page eq 'all') {
+ $number_per_page=$num_todo;
+ }
+ my $flag_latex_header_remove = 'NO';
+ my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$num_todo,'inline','75');
my $count=0;
foreach my $code (sort(@allcodes)) {
my $file_num=int($count/$number_per_page);
$moreenv{'CODE'}=&num_to_letters($code);
my ($output,$fullname)=
&print_resources($r,$helper,'anonymous',$type,\%moreenv,
- \@master_seq,$flag_latex_header_remove);
+ \@master_seq,$flag_latex_header_remove,
+ $LaTeXwidth);
$print_array[$file_num].=$output;
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
&mt('last assignment').' '.$fullname);
$flag_latex_header_remove = 'YES';
$count++;
+ if (&Apache::loncommon::connection_aborted($r)) { last; }
}
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
$result .= $print_array[0].' \end{document}';
@@ -1114,9 +1287,7 @@ ENDPART
my $urlp = $list_of_files[$i];
$urlp=~s|//|/|;
if ($urlp=~/\//) {
- my %form;
- $form{'grade_target'}='tex';
- $form{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
+ $form{'problem_split'}=$parmhash{'problem_stream_switch'};
$form{'rndseed'}=$rndseed;
if ($urlp =~ m|/home/([^/]+)/public_html|) {
$urlp =~ s|/home/([^/]*)/public_html|/~$1|;
@@ -1126,7 +1297,6 @@ ENDPART
my $texversion=&Apache::lonnet::ssi($urlp,%form);
if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
- my %form;
$form{'grade_target'}='answer';
$form{'answer_output_mode'}='tex';
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
@@ -1174,19 +1344,20 @@ ENDPART
}
#-------------------------------------------------------- corrections for the different page formats
$result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'},$helper->{'VARS'}->{'TABLE_CONTENTS'},$helper->{'VARS'}->{'TABLE_INDEX'},$selectionmade);
- $result = &latex_corrections($number_of_columns,$result);
- for (my $i=1;$i<=$#print_array;$i++) {$print_array[$i] = &latex_corrections($number_of_columns,$print_array[$i]);}
+ $result = &latex_corrections($number_of_columns,$result,$selectionmade);
+ for (my $i=1;$i<=$#print_array;$i++) {$print_array[$i] = &latex_corrections($number_of_columns,$print_array[$i],$selectionmade);}
#changes page's parameters for the one column output
if ($numberofcolumns == 1) {
- $result =~ s/\\textwidth\s*=\s*\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
- $result =~ s/\\textheight\s*=\s*\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
- $result =~ s/\\evensidemargin\s*=\s*\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
- $result =~ s/\\oddsidemargin\s*=\s*\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+ $result =~ s/\\textwidth\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textwidth= $helper->{'VARS'}->{'pagesize.width'} $helper->{'VARS'}->{'pagesize.widthunit'} /;
+ $result =~ s/\\textheight\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\textheight $helper->{'VARS'}->{'pagesize.height'} $helper->{'VARS'}->{'pagesize.heightunit'} /;
+ $result =~ s/\\evensidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\evensidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
+ $result =~ s/\\oddsidemargin\s*=\s*-?\d*\.?\d*\s*(cm|mm|in)/\\oddsidemargin= $helper->{'VARS'}->{'pagesize.lmargin'} $helper->{'VARS'}->{'pagesize.lmarginunit'} /;
}
+
#-- writing .tex file in prtspool
my $temp_file;
my $identifier = &Apache::loncommon::get_cgi_id();
- my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout_".$identifier.".tex";
+ my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout_".$identifier.".tex";
if (!($#print_array>0)) {
unless ($temp_file = Apache::File->new('>'.$filename)) {
$r->log_error("Couldn't open $filename for output $!");
@@ -1226,9 +1397,9 @@ ENDPART
if ($#student_names>-1) {
$student_names=$student_names[0].'_ENDPERSON_';
} else {
- my $fullname = &get_name($ENV{'user.name'},$ENV{'user.domain'});
- $student_names=join(':',$ENV{'user.name'},$ENV{'user.domain'},
- $ENV{'request.course.sec'},$fullname).
+ my $fullname = &get_name($env{'user.name'},$env{'user.domain'});
+ $student_names=join(':',$env{'user.name'},$env{'user.domain'},
+ $env{'request.course.sec'},$fullname).
'_ENDPERSON_'.'_END_';
}
}
@@ -1236,7 +1407,7 @@ ENDPART
my $URLback=''; #link to original document
if ($helper->{'VARS'}->{'construction'} ne '1') {
#prints published resource
- $URLback=$helper->{'VARS'}->{'postdata'};
+ $URLback=&Apache::lonnet::escape('/adm/flip?postdata=return:');
} else {
#prints resource from the construction space
$URLback='/'.$helper->{'VARS'}->{'filename'};
@@ -1253,13 +1424,15 @@ ENDPART
'cgi.'.$identifier.'.selection' => $selectionmade,
'cgi.'.$identifier.'tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
'cgi.'.$identifier.'tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
- 'cgi.'.$identifier.'role' => $ENV{'request.role.adv'},
+ 'cgi.'.$identifier.'role' => $env{'request.role.adv'},
'cgi.'.$identifier.'numberoffiles' => $#print_array,
'cgi.'.$identifier.'studentnames' => $student_names,
'cgi.'.$identifier.'backref' => $URLback,);
$r->print(<<FINALEND);
+<br />
<meta http-equiv="Refresh" content="0; url=/cgi-bin/printout.pl?$identifier" />
+<a href="/cgi-bin/printout.pl?$identifier">Continue</a>
</body>
</html>
FINALEND
@@ -1288,36 +1461,48 @@ sub get_CODE {
}
sub print_resources {
- my ($r,$helper,$person,$type,$moreenv,$master_seq,$remove_latex_header)=@_;
+ my ($r,$helper,$person,$type,$moreenv,$master_seq,$remove_latex_header,
+ $LaTeXwidth)=@_;
my $current_output = '';
my ($username,$userdomain,$usersection) = split /:/,$person;
my $fullname = &get_name($username,$userdomain);
+ my $namepostfix;
if ($person =~ 'anon') {
+ $namepostfix="\\\\Name: ";
$fullname = "CODE - ".$moreenv->{'CODE'};
}
+ my $i = 0;
#goes through all resources, checks if they are available for
#current student, and produces output
&Apache::lonnet::delenv('form.counter');
&Apache::lonxml::init_counter();
+
+ my %page_breaks = &get_page_breaks($helper);
+
foreach my $curresline (@{$master_seq}) {
+ if (defined $page_breaks{$curresline}) {
+ if($i != 0) {
+ $current_output.= "\\newpage\n";
+ }
+ }
+ $i++;
if ( !($type eq 'problems' &&
($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
if (&Apache::lonnet::allowed('bre',$res_url)) {
if ($res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
- my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$ENV{'request.course.id'},'tex',$moreenv);
+ my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
my $lonidsdir=$r->dir_config('lonIDsDir');
- my $envfile=$ENV{'user.environment'};
+ my $envfile=$env{'user.environment'};
$envfile=~/\/([^\/]+)\.id$/;
$envfile=$1;
&Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile);
- my $current_counter=$ENV{'form.counter'};
+ my $current_counter=$env{'form.counter'};
if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
- my %form;
- $form{'answer_output_mode'}='tex';
- $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
- my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$ENV{'request.course.id'},%form);
+ $moreenv->{'answer_output_mode'}='tex';
+ $moreenv->{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ my $ansrendered = &Apache::loncommon::get_student_answers($curresline,$username,$userdomain,$env{'request.course.id'},%{$moreenv});
&Apache::lonnet::appenv(('form.counter' => $current_counter));
if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
$rendered=~s/(\\keephidden{ENDOFPROBLEM})/$ansrendered$1/;
@@ -1335,13 +1520,13 @@ sub print_resources {
}
$current_output .= $rendered;
} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
- my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$ENV{'request.course.id'},'tex',$moreenv);
+ my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
my $lonidsdir=$r->dir_config('lonIDsDir');
- my $envfile=$ENV{'user.environment'};
+ my $envfile=$env{'user.environment'};
$envfile=~/\/([^\/]+)\.id$/;
$envfile=$1;
&Apache::lonnet::transfer_profile_to_env($lonidsdir,$envfile);
- my $current_counter=$ENV{'form.counter'};
+ my $current_counter=$env{'form.counter'};
if ($remove_latex_header eq 'YES') {
$rendered = &latex_header_footer_remove($rendered);
} else {
@@ -1360,17 +1545,18 @@ sub print_resources {
}
$remove_latex_header = 'YES';
}
+ if (&Apache::loncommon::connection_aborted($r)) { last; }
}
my $courseidinfo = &get_course();
if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
if ($current_output=~/\\documentclass/) {
- $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}}\\vskip 3 mm /;
+ $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent\\lhead{\\textit{\\textbf{$fullname}}$courseidinfo \\hfill \\thepage \\\\ \\textit{$currentassignment}$namepostfix}}\\vskip 5 mm /;
} else {
my $blankpages = '';
for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blankpages.='\clearpage\strut\clearpage';}
- $current_output = '\strut\vspace*{-4 mm}\\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 '.$blankpages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}}} \vskip -5 mm '.$current_output;
+ $current_output = '\strut\vspace*{-6 mm}\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\vspace*{-2 mm}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blankpages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}}'.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$currentassignment.'}'.$namepostfix.'}} \vskip 5 mm '.$current_output;
}
return ($current_output,$fullname);
@@ -1385,7 +1571,7 @@ sub handler {
# if ($loaderror) { return $loaderror; }
# $loaderror=
# &Apache::lonnet::overloaderror($r,
-# $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+# $env{'course.'.$env{'request.course.id'}.'.home'});
# if ($loaderror) { return $loaderror; }
my $result = printHelper($r);
@@ -1398,19 +1584,28 @@ sub handler {
# foreach $key (keys %{$helper->{'VARS'}}) {
# $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />');
# }
-# foreach $key (keys %ENV) {
-# $r->print(' '.$key.'->'.$ENV{$key}.'<-<br />');
+# foreach $key (keys %env) {
+# $r->print(' '.$key.'->'.$env{$key}.'<-<br />');
# }
# return OK;
- my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
-
+ my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
+
# my $key;
# foreach $key (keys %parmhash) {
# $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />');
# }
-# return OK;
+#
+
+ # If a figure conversion queue file exists for this user.domain
+ # we delete it since it can only be bad (if it were good, printout.pl
+ # would have deleted it the last time around.
+
+ my $conversion_queuefile = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat";
+ if(-e $conversion_queuefile) {
+ unlink $conversion_queuefile;
+ }
&output_data($r,$helper,\%parmhash);
return OK;
}
@@ -1429,13 +1624,8 @@ use Data::Dumper;
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);
- }
-
if ($r->header_only) {
- if ($ENV{'browser.mathml'}) {
+ if ($env{'browser.mathml'}) {
&Apache::loncommon::content_type($r,'text/xml');
} else {
&Apache::loncommon::content_type($r,'text/html');
@@ -1445,7 +1635,7 @@ sub printHelper {
}
# Send header, nocache
- if ($ENV{'browser.mathml'}) {
+ if ($env{'browser.mathml'}) {
&Apache::loncommon::content_type($r,'text/xml');
} else {
&Apache::loncommon::content_type($r,'text/html');
@@ -1468,34 +1658,58 @@ sub printHelper {
$helper->declareVar('construction');
$helper->declareVar('assignment');
$helper->declareVar('style_file');
+ $helper->declareVar('student_sort');
+ $helper->declareVar('FINISHPAGE');
+ $helper->declareVar('PRINT_TYPE');
+ $helper->declareVar("showallfoils");
+
+ # The page breaks can get loaded initially from the course environment:
+
+ if((!defined($env{"form.CURRENT_STATE"})) ||
+ ($env{'form.CURRENT_STATE'} == "START")) {
+ $helper->{VARS}->{FINISHPAGE} = ""; # In case they did a back e.g.
+ }
+
+
+
+ &Apache::loncommon::restore_course_settings('print',
+ {'pagebreaks' => 'scalar',
+ 'lastprinttype' => 'scalar'});
+
+
+ if("$helper->{VARS}->{PRINT_TYPE}" eq "$env{'form.lastprinttype'}") {
+ $helper->{VARS}->{FINISHPAGE} = $env{'form.pagebreaks'};
+ }
+
# 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:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
+ if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
$helper->{VARS}->{'filename'} = "~$1/$2";
$helper->{VARS}->{'construction'} = 1;
} else {
- if ($ENV{'form.postdata'}) {
- $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($ENV{'form.postdata'});
+ 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.symb'}) {
+ $helper->{VARS}->{'symb'} = $env{'form.symb'};
}
- if ($ENV{'form.url'}) {
+ 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.symb'}) {
+ $helper->{VARS}->{'symb'} = $env{'form.symb'};
}
- if ($ENV{'form.url'}) {
+ if ($env{'form.url'}) {
$helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($helper->{VARS}->{'postdata'});
}
-
- my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
+ $helper->{VARS}->{'symb'}=
+ &Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});
+ my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu($helper);
if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
@@ -1512,7 +1726,8 @@ sub printHelper {
0, rindex($helper->{VARS}->{'filename'}, '/') + 1);
} else {
($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
- $helper->{VARS}->{'postdata'} = Apache::lonnet::clutter($url);
+ $helper->{VARS}->{'postdata'} =
+ &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
my $postdata = $helper->{VARS}->{'postdata'};
@@ -1520,17 +1735,17 @@ sub printHelper {
}
$subdir = &Apache::lonnet::filelocation("", $url);
}
- if (!$helper->{VARS}->{'curseed'} && $ENV{'form.curseed'}) {
- $helper->{VARS}->{'curseed'}=$ENV{'form.curseed'};
+ if (!$helper->{VARS}->{'curseed'} && $env{'form.curseed'}) {
+ $helper->{VARS}->{'curseed'}=$env{'form.curseed'};
}
- if (!$helper->{VARS}->{'probstatus'} && $ENV{'form.problemtype'}) {
- $helper->{VARS}->{'probstatus'}=$ENV{'form.problemtype'};
+ if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
+ $helper->{VARS}->{'probstatus'}=$env{'form.problemtype'};
}
my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
- my $userPriviledged = ($ENV{'request.role'}=~m/^cc\./ or
- $ENV{'request.role'}=~m/^in\./ or
- $ENV{'request.role'}=~m/^ta\./);
+ my $userPriviledged = ($env{'request.role'}=~m/^cc\./ or
+ $env{'request.role'}=~m/^in\./ or
+ $env{'request.role'}=~m/^ta\./);
Apache::lonhelper::registerHelperTags();
@@ -1567,17 +1782,18 @@ sub printHelper {
my $isNotMap = '!$res->is_sequence()';
$isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
my $isMap = '$res->is_map()';
- my $symbFilter = '$res->symb()';
- my $urlValue = '$res->src()';
+ my $symbFilter = '$res->shown_symb()';
+ my $urlValue = '$res->link()';
$helper->declareVar('SEQUENCE');
# Useful for debugging: Dump the help vars
- #$r->print(Dumper($helper->{VARS}));
- #$r->print($map);
+# $r->print(Dumper($helper->{VARS}));
+# $r->print($map);
# If we're in a sequence...
if (($helper->{'VARS'}->{'construction'} ne '1') &&
+
$helper->{VARS}->{'postdata'} &&
$helper->{VARS}->{'assignment'}) {
# Allow problems from sequence
@@ -1594,6 +1810,7 @@ sub printHelper {
<filterfunc>return $isProblem;</filterfunc>
<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>
+ <option text='Newpage' variable='FINISHPAGE' />
</resource>
</state>
@@ -1605,18 +1822,21 @@ sub printHelper {
<filterfunc>return $isNotMap;</filterfunc>
<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>
+ <option text='Newpage' variable='FINISHPAGE' />
</resource>
</state>
HELPERFRAGMENT
- &Apache::lonxml::xmlparse($r, 'helper', $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 the user is privileged, allow them to print all
+ # problems and resources in the entier course, optionally for selected students
if ($userPriviledged &&
($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {
+
push @{$printChoices}, ['<b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
+ push @{$printChoices}, ['<b>Resources</b> from <b>entire course</b>', 'all_resources', 'ALL_RESOURCES'];
&Apache::lonxml::xmlparse($r, 'helper', <<ALL_PROBLEMS);
<state name="ALL_PROBLEMS" title="Select Problem(s) to print">
<message>(mark them then click "next" button) <br /></message>
@@ -1626,6 +1846,17 @@ HELPERFRAGMENT
<filterfunc>return $isProblemOrMap;</filterfunc>
<choicefunc>return $isNotMap;</choicefunc>
<valuefunc>return $symbFilter;</valuefunc>
+ <option text='Newpage' variable='FINISHPAGE' />
+ </resource>
+ </state>
+ <state name="ALL_RESOURCES" title="Select Resource(s) to print">
+ <message>(Mark them then click "next" button) <br /> </message>
+ <resource variable="RESOURCES" toponly='0' multichoice='1'
+ suppressEmptySequences='0' addstatus='1' closeallpages='1'>
+ <nextstate>PAGESIZE</nextstate>
+ <filterfunc>return $isNotMap; </filterfunc>
+ <valuefunc>return $symbFilter;</valuefunc>
+ <option text='NewPage' variable='FINISHPAGE' />
</resource>
</state>
ALL_PROBLEMS
@@ -1641,6 +1872,7 @@ ALL_PROBLEMS
<filterfunc>return $isProblem;</filterfunc>
<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>
+ <option text='New Page' variable='FINISHPAGE' />
</resource>
<message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
<choices variable="EMPTY_PAGES">
@@ -1655,26 +1887,43 @@ RESOURCE_SELECTOR
&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
<state name="CHOOSE_STUDENTS" title="Select Students and Resources">
- <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+ <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" coursepersonnel="1"/>
+ <message><b>Select sort order</b> </message>
+ <choices variable='student_sort'>
+ <choice computer='0'>Sort by section then student</choice>
+ <choice computer='1'>Sort by students across sections.</choice>
+ </choices>
$resource_selector
</state>
CHOOSE_STUDENTS
- my $cdom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
- my $cnum = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);
my $namechoice='<choice></choice>';
- foreach my $name (@names) {
+ foreach my $name (sort {uc($a) cmp uc($b)} @names) {
if ($name =~ /^error: 2 /) { next; }
$namechoice.='<choice computer="'.$name.'">'.$name.'</choice>';
}
&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON1);
<state name="CHOOSE_ANON1" title="Select Students and Resources">
<nextstate>PAGESIZE</nextstate>
- <message><hr width='33%' /><b>Number of anonymous assignments to print?</b></message>
- <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"></string>
- <message><br /><b>Names to store the CODEs under for later:</b></message>
+ <message><hr width='33%' /></message>
+ <message><table><tr><td><b>Number of anonymous assignments to print?</b></td><td></message>
+ <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
+ <validator>
+ if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
+ !\$helper->{'VARS'}{'REUSE_OLD_CODES'}) {
+ return "You need to specify the number of assignments to print";
+ }
+ return undef;
+ </validator>
+ </string>
+ <message></td></tr><tr><td></message>
+ <message><b>Names to store the CODEs under for later:</b></message>
+ <message></td><td></message>
<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
+ <message></td></tr></table></message>
<message><hr width='33%' /></message>
<message><b>Reprint a set of saved CODEs:</b></message>
<dropdown variable="REUSE_OLD_CODES">
@@ -1699,6 +1948,7 @@ CHOOSE_ANON1
<filterfunc>return $isNotMap;</filterfunc>
<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>
+ <option text='Newpage' variable='FINISHPAGE' />
</resource>
<message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
<choices variable="EMPTY_PAGES">
@@ -1713,7 +1963,12 @@ RESOURCE_SELECTOR
&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS1);
<state name="CHOOSE_STUDENTS1" title="Select Students and Resources">
- <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
+ <student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" coursepersonnel="1" />
+ <choices variable='student_sort'>
+ <choice computer='0'>Sort by section then student</choice>
+ <choice computer='1'>Sort by students across sections.</choice>
+ </choices>
+
$resource_selector
</state>
CHOOSE_STUDENTS1
@@ -1721,10 +1976,21 @@ CHOOSE_STUDENTS1
&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON2);
<state name="CHOOSE_ANON2" title="Select Students and Resources">
<nextstate>PAGESIZE</nextstate>
- <message><hr width='33%' /><b>Number of anonymous assignments to print?</b></message>
- <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5"></string>
- <message><br /><b>Names to store the CODEs under for later:</b></message>
+ <message><table><tr><td><b>Number of anonymous assignments to print?</b></td><td></message>
+ <string variable="NUMBER_TO_PRINT_TOTAL" maxlength="5" size="5">
+ <validator>
+ if (((\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'}+0) < 1) &&
+ !\$helper->{'VARS'}{'REUSE_OLD_CODES'}) {
+ return "You need to specify the number of assignments to print";
+ }
+ return undef;
+ </validator>
+ </string>
+ <message></td></tr><tr><td></message>
+ <message><b>Names to store the CODEs under for later:</b></message>
+ <message></td><td></message>
<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
+ <message></td></tr></table></message>
<message><hr width='33%' /></message>
<message><b>Reprint a set of saved CODEs:</b></message>
<dropdown variable="REUSE_OLD_CODES">
@@ -1737,7 +2003,7 @@ CHOOSE_ANON2
}
# FIXME: That RE should come from a library somewhere.
- 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'}) and $ENV{'request.role.adv'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') {
+ 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'}) and $env{'request.role.adv'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') {
push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from current subdirectory')." <b><i>$subdir</i></b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
my $f = '$filename';
@@ -1777,6 +2043,7 @@ CHOOSE_FROM_SUBDIR
<nextstate>CHOOSE_FROM_ANY_SEQUENCE</nextstate>
<filterfunc>return \$res->is_sequence;</filterfunc>
<valuefunc>return $urlValue;</valuefunc>
+ <option text='Newpage' variable='FINISHPAGE' />
</resource>
</state>
<state name="CHOOSE_FROM_ANY_SEQUENCE" title="Select Resources To Print">
@@ -1787,6 +2054,7 @@ CHOOSE_FROM_SUBDIR
<filterfunc>return $isProblem</filterfunc>
<mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
<valuefunc>return $symbFilter;</valuefunc>
+ <option text='Newpage' variable='FINISHPAGE' />
</resource>
</state>
CHOOSE_FROM_ANY_SEQUENCE
@@ -1799,14 +2067,13 @@ CHOOSE_FROM_ANY_SEQUENCE
Apache::lonhelper::message->new();
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'PRINT_TYPE';
- $helper->declareVar('PRINT_TYPE');
$paramHash->{CHOICES} = $printChoices;
Apache::lonhelper::choices->new();
my $startedTable = 0; # have we started an HTML table yet? (need
# to close it later)
- if (($ENV{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) or
+ if (($env{'request.role.adv'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or
($helper->{VARS}->{'construction'} eq '1')) {
addMessage("<hr width='33%' /><table><tr><td align='right'>Print: </td><td>");
$paramHash = Apache::lonhelper::getParamHash();
@@ -1815,15 +2082,14 @@ CHOOSE_FROM_ANY_SEQUENCE
$paramHash->{CHOICES} = [
['Without Answers', 'yes'],
['With Answers', 'no'],
- ['Only Answers', 'only'],
- ['As Exam Problem', 'exam']
+ ['Only Answers', 'only']
];
Apache::lonhelper::dropdown->new();
addMessage("</td></tr>");
$startedTable = 1;
}
- if ($ENV{'request.role.adv'}) {
+ if ($env{'request.role.adv'}) {
if (!$startedTable) {
addMessage("<hr width='33%' /><table><tr><td align='right'>LaTeX mode: </td><td>");
$startedTable = 1;
@@ -1873,10 +2139,24 @@ CHOOSE_FROM_ANY_SEQUENCE
['Yes', 'yes'] ];
Apache::lonhelper::dropdown->new();
addMessage("</td></tr>");
+
+ # If advanced roles, then allow to show all foils.
+
+ if ($ENV{'request.role.adv'}) {
+ addMessage("<tr><td align = 'right'> </td><td>");
+ $paramHash = Apache::lonhelper::getParamHash();
+ $paramHash->{'multichoice'} = "true";
+ $paramHash->{'allowempty'} = "true";
+ $paramHash->{'variable'} = "showallfoils";
+ $paramHash->{'CHOICES'} = [ ["Show all foils", "1"] ];
+ Apache::lonhelper::choices->new();
+ addMessage("</td></tr>");
+ }
+
}
if ($helper->{'VARS'}->{'construction'}) {
- my $stylevalue=$ENV{'construct.style'};
+ my $stylevalue=$env{'construct.style'};
my $xmlfrag .= <<"RNDSEED";
<message><tr><td align='right'>Use random seed: </td><td></message>
<string variable="curseed" size="15" maxlength="15">
@@ -1887,10 +2167,15 @@ CHOOSE_FROM_ANY_SEQUENCE
<message></td></tr><tr><td align="right">Use style file:</td><td></message>
<message><input type="text" size="40" name="style_file_value" value="$stylevalue" /> <a href="javascript:openbrowser('helpform','style_file','sty')">Select style file</a> </td><td></message>
<message></td></tr></message>
+ <choices allowempty="1" multichoice="true" variable="showallfoils">
+ <choice computer="1">Show all foils?</choice>
+ </choices>
RNDSEED
&Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
- $helper->{'VARS'}->{'style_file'}=$ENV{'form.style_file_value'};
- }
+ $helper->{'VARS'}->{'style_file'}=$env{'form.style_file_value'};
+
+ }
+
}
@@ -1918,9 +2203,7 @@ RNDSEED
$r->print($helper->display());
- Apache::lonhelper::unregisterHelperTags();
-
- untie %hash;
+ &Apache::lonhelper::unregisterHelperTags();
return OK;
}
@@ -1959,12 +2242,13 @@ no strict;
@ISA = ("Apache::lonhelper::element");
use strict;
use Apache::lonlocal;
+use Apache::lonnet;
my $maxColumns = 2;
-my @paperSize = ("Letter [8 1/2x11 in]", "Legal [8 1/2x14 in]",
- "Ledger/Tabloid [11x17 in]", "Executive [7 1/2x10 in]",
- "A2 [420x594 mm]", "A3 [297x420 mm]", "A4 [210x297 mm]",
- "A5 [148x210 mm]", "A6 [105x148 mm]" );
+my @paperSize = ("letter [8 1/2x11 in]", "legal [8 1/2x14 in]",
+ "tabloid (ledger) [11x17 in]", "executive [7 1/2x10 in]",
+ "a2 [420x594 mm]", "a3 [297x420 mm]", "a4 [210x297 mm]",
+ "a5 [148x210 mm]", "a6 [105x148 mm]" );
# Tentative format: Orientation (L = Landscape, P = portrait) | Colnum |
# Paper type
@@ -2019,19 +2303,20 @@ STATEHTML
$result .= "</select></td><td>\n";
$result .= "<select name='${var}.paper'>\n";
- my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
+ my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
my $DefaultPaperSize=$parmhash{'default_paper_size'};
if ($DefaultPaperSize eq '') {$DefaultPaperSize='letter';}
$i = 0;
foreach (@paperSize) {
+ $_=~/(\w+)/;
+ my $papersize=$1;
if ($paperSize[$i]=~/$DefaultPaperSize/) {
- $result .= "<option selected value='$i'>" . $paperSize[$i] . "</option>\n";
+ $result .= "<option selected value='$papersize'>" . $paperSize[$i] . "</option>\n";
} else {
- $result .= "<option value='$i'>" . $paperSize[$i] . "</option>\n";
+ $result .= "<option value='$papersize'>" . $paperSize[$i] . "</option>\n";
}
$i++;
}
-
$result .= "</select></td></tr></table>";
return $result;
}
@@ -2042,8 +2327,8 @@ sub postprocess {
my $var = $self->{'variable'};
my $helper = Apache::lonhelper->getHelper();
$helper->{VARS}->{$var} =
- $ENV{"form.$var.layout"} . '|' . $ENV{"form.$var.cols"} . '|' .
- $ENV{"form.$var.paper"};
+ $env{"form.$var.layout"} . '|' . $env{"form.$var.cols"} . '|' .
+ $env{"form.$var.paper"};
return 1;
}
@@ -2073,7 +2358,7 @@ is no tag interface. You actually pass p
=cut
use Apache::lonhelper;
-
+use Apache::lonnet;
no strict;
@ISA = ("Apache::lonhelper::element");
use strict;
@@ -2171,12 +2456,12 @@ sub postprocess {
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 $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 = '';