--- loncom/interface/lonprintout.pm 2006/08/03 02:36:56 1.476
+++ loncom/interface/lonprintout.pm 2009/11/17 11:32:23 1.565
@@ -2,7 +2,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.476 2006/08/03 02:36:56 albertel Exp $
+# $Id: lonprintout.pm,v 1.565 2009/11/17 11:32:23 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -23,12 +23,10 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# /home/httpd/html/adm/gpl.txt
-#
# http://www.lon-capa.org/
#
#
package Apache::lonprintout;
-
use strict;
use Apache::Constants qw(:common :http);
use Apache::lonxml;
@@ -39,17 +37,455 @@ use Apache::grades;
use Apache::edit;
use Apache::File();
use Apache::lonnavmaps;
-use Apache::lonratedt;
+use Apache::admannotations;
+use Apache::lonenc;
+use Apache::entities;
+use Apache::londefdef;
+
+use File::Basename;
+
+use HTTP::Response;
+
+use LONCAPA::map();
use POSIX qw(strftime);
use Apache::lonlocal;
use Carp;
-use lib '/home/httpd/lib/perl/';
use LONCAPA;
my %perm;
my %parmhash;
my $resources_printed;
+# Global variables that describe errors in ssi calls detected by ssi_with_retries.
+#
+
+my $ssi_error; # True if there was an ssi error.
+my $ssi_last_error_resource; # The resource URI that could not be fetched.
+my $ssi_last_error; # The error text from the server. (e.g. 500 Server timed out).
+
+#
+# Our ssi max retry count.
+#
+
+my $ssi_retry_count = 5; # Some arbitrary value.
+
+
+# Font size:
+
+my $font_size = 'normalsize'; # Default is normalsize...
+
+#---------------------------- Helper helpers. -------------------------
+
+# Returns the text needd for a student chooser.
+# that text must still be parsed by the helper xml parser.
+# Parameters:
+# this_state - State name of the chooser.
+# sort_choice - variable to hold the sorting choice.
+# variable - Name of variable to hold students.
+# next_state - State after chooser.
+
+
+sub generate_student_chooser {
+ my ($this_state,
+ $sort_choice,
+ $variable,
+ $next_state) = @_;
+ my $result = <<CHOOSE_STUDENTS;
+ <state name="$this_state" title="Select Students and Resources">
+ <message><b>Select sorting order of printout</b> </message>
+
+ <choices variable="$sort_choice">
+ <choice computer='0'>Sort by section then student</choice>
+ <choice computer='1'>Sort by students across sections.</choice>
+ </choices>
+
+ <message><br /><hr /><br /> </message>
+ <student multichoice='1'
+ variable="$variable"
+ nextstate="$next_state"
+ coursepersonnel="1" />
+ </state>
+
+CHOOSE_STUDENTS
+
+ return $result;
+}
+
+# Generate the text needed for a resource chooser given the top level of
+# the sequence/page
+#
+# Parameters:
+# this_state - State name of the chooser.
+# prompt_text - Text to use to prompt user.
+# resource_options - Resource tag options e.g.
+# "multichoice='1', toponly='1', addstatus='1'"
+# that control the selection and appearance of the
+# resource selector.
+# variable - Name of the variable to hold the choice
+# next_state - Name of the next state the helper should transition
+# to
+# top_url - Top level URL within which to make the selector.
+# If empty the top level sequence is shown.
+# filter - How to filter the resources.
+# value_func - <valuefunc> function.
+# choice_func - If not empty generates a <choicefunc> with this function.
+# start_new_option
+# - Fragment appended after valuefunc.
+#
+#
+sub generate_resource_chooser {
+ my ($this_state,
+ $prompt_text,
+ $resource_options,
+ $variable,
+ $next_state,
+ $top_url,
+ $filter,
+ $choice_func,
+ $value_func,
+ $start_new_option) = @_;
+
+ my $result = <<CHOOSE_RESOURCES;
+<state name="$this_state" title="$prompt_text">
+ <resource variable="$variable" $resource_options
+ closeallpages="1">
+ <nextstate>$next_state</nextstate>
+ <filterfunc>return $filter;</filterfunc>
+CHOOSE_RESOURCES
+ if ($choice_func ne '') {
+ $result .= "<choicefunc>return $choice_func;</choicefunc>";
+ }
+ if ($top_url ne '') {
+ $result .= "<mapurl>$top_url</mapurl>";
+ }
+ $result .= <<CHOOSE_RESOURCES;
+ <valuefunc>return $value_func;</valuefunc>
+ $start_new_option
+ </resource>
+ </state>
+CHOOSE_RESOURCES
+
+ return $result;
+}
+#
+# Generate the helper XML for a code choice helper dialog:
+#
+# Paramters:
+# $helper - Reference to the helper.
+# $state - Name of the state for the chooser.
+# $next_state - Name fo the state to follow the chooser.
+# $bubble_types - Populates the bubble sheet type dropt down.
+# $code_selections - Provides set of code choices that have been used
+# $saved_codes - Provides the list of saved codes.
+#
+# Returns;
+# The Xml of the code chooser.
+#
+sub generate_code_selector {
+ my ($helper,
+ $state,
+ $next_state,
+ $bubble_types,
+ $code_selections,
+ $saved_codes) = @_; # Unpack the parameters.
+
+ my $result = <<CHOOSE_ANON1;
+ <state name="$state" title="Specify CODEd Assignments">
+ <nextstate>$next_state</nextstate>
+ <message><h4>Fill out one of the forms below</h4></message>
+ <message><br /><hr /> <br /></message>
+ <message><h3>Generate new CODEd Assignments</h3></message>
+ <message><table><tr><td><b>Number of CODEd 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'} &&
+ !\$helper->{'VARS'}{'SINGLE_CODE'} &&
+ !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
+ 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 save the CODEs under for later:</b></message>
+ <message></td><td></message>
+ <string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
+ <message></td></tr><tr><td></message>
+ <message><b>Bubble sheet type:</b></message>
+ <message></td><td></message>
+ <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
+ $bubble_types
+ </dropdown>
+ <message></td></tr><tr><td colspan="2"></td></tr><tr><td></message>
+ <message></td></tr><tr><td></table></message>
+ <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>
+ <message><tr><td><b>Enter a CODE to print:</b></td><td></message>
+ <string variable="SINGLE_CODE" size="10">
+ <validator>
+ if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'} &&
+ !\$helper->{'VARS'}{'REUSE_OLD_CODES'} &&
+ !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
+ return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
+ \$helper->{'VARS'}{'CODE_OPTION'});
+ } else {
+ return undef; # Other forces control us.
+ }
+ </validator>
+ </string>
+ <message></td></tr><tr><td></message>
+ $code_selections
+ <message></td></tr></table></message>
+ <message><hr /><h3>Reprint a Set of Saved CODEs</h3><table><tr><td></message>
+ <message><b>Select saved CODEs:</b></message>
+ <message></td><td></message>
+ <dropdown variable="REUSE_OLD_CODES">
+ $saved_codes
+ </dropdown>
+ <message></td></tr></table></message>
+ </state>
+CHOOSE_ANON1
+
+ return $result;
+}
+
+#-----------------------------------------------------------------------
+
+
+# Fetch the contents of a resource, uninterpreted.
+# This is used here to fetch a latex file to be included
+# verbatim into the printout<
+# NOTE: Ask Guy if there is a lonnet function similar to this?
+#
+# Parameters:
+# URL of the file
+#
+sub fetch_raw_resource {
+ my ($url) = @_;
+
+ my $filename = &Apache::lonnet::filelocation("", $url);
+ my $contents = &Apache::lonnet::getfile($filename);
+
+ if ($contents == -1) {
+ return "File open failed for $filename"; # This will bomb the print.
+ }
+ return $contents;
+
+
+}
+
+# Fetch the annotations associated with a URL and
+# put a centered 'annotations:' title.
+# This is all suppressed if the annotations are empty.
+#
+sub annotate {
+ my ($symb) = @_;
+
+ my $annotation_text = &Apache::loncommon::get_annotation($symb, 1);
+
+
+ my $result = "";
+
+ if (length($annotation_text) > 0) {
+ $result .= '\\hspace*{\\fill} \\\\[\\baselineskip] \textbf{Annotations:} \\\\ ';
+ $result .= "\n";
+ $result .= &Apache::lonxml::latex_special_symbols($annotation_text,""); # Escape latex.
+ $result .= "\n\n";
+ }
+ return $result;
+}
+
+#
+# Set a global document font size:
+# This is done by replacing \begin{document}
+# with \begin{document}{\some-font-directive
+# and \end{document} with
+# }\end{document
+#
+sub set_font_size {
+
+ my ($text) = @_;
+
+ $text =~ s/\\begin{document}/\\begin{document}{\\$font_size/;
+ $text =~ s/\\end{document}/}\\end{document}/;
+ return $text;
+
+
+}
+
+# include_pdf - PDF files are included into the
+# output as follows:
+# - The PDF, if necessary, is replicated.
+# - The PDF is added to the list of files to convert to postscript (along with the images).
+# - The LaTeX is added to include the final converted postscript in the file as an included
+# job. The assumption is that the includedpsheader.ps header will be included.
+#
+# Parameters:
+# pdf_uri - URI of the PDF file to include.
+#
+# Returns:
+# The LaTeX to include.
+#
+# Assumptions:
+# The uri is actually a PDF file
+# The postscript will have the includepsheader.ps included.
+#
+#
+sub include_pdf {
+ my ($pdf_uri) = @_;
+
+ # Where is the file? If not local we'll need to repcopy it:'
+
+ my $file = &Apache::lonnet::filelocation('', $pdf_uri);
+ if (! -e $file) {
+ &Apache::lonnet::repcopy($file);
+ $file = &Apache::lonnet::filelocation('',$pdf_uri);
+ }
+
+ # The file isn ow replicated locally.. or it did not exist in the first place
+ # (unlikely). If it did exist, add the pdf to the set of files/images that
+ # need tob e converted for this print job:
+
+ $file =~ s|(.*)/res/|/home/httpd/html/res/|;
+
+ open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");
+ print FILE ("$file\n");
+ close (FILE);
+
+ # Construct the special to put out. To do this we need to get the
+ # resulting filename after conversion. The file will have the same name
+ # but will be in the user's spool directory with converted images.
+
+ my $dirname = "/home/httpd/prtspool/$env{'user.name'}/";
+ my ( $base, $path, $ext) = &fileparse($file, '.pdf');
+# my $destname = $dirname.'/'.$base.'.eps'; # Not really an eps but easier in printout.pl
+ $base =~ s/ /\_/g;
+
+
+ my $output = &print_latex_header();
+ $output .= '\special{ps: _begin_job_ ('
+ .$base.'.pdf.eps'.
+ ')run _end_job_}';
+
+ return $output;
+
+
+}
+
+
+#
+# ssi_with_retries- Does the server side include of a resource.
+# if the ssi call returns an error we'll retry it up to
+# the number of times requested by the caller.
+# If we still have a proble, no text is appended to the
+# output and we set some global variables.
+# to indicate to the caller an SSI error occurred.
+# All of this is supposed to deal with the issues described
+# in LonCAPA BZ 5631 see:
+# http://bugs.lon-capa.org/show_bug.cgi?id=5631
+# by informing the user that this happened.
+#
+# Parameters:
+# resource - The resource to include. This is passed directly, without
+# interpretation to lonnet::ssi.
+# form - The form hash parameters that guide the interpretation of the resource
+#
+# retries - Number of retries allowed before giving up completely.
+# Returns:
+# On success, returns the rendered resource identified by the resource parameter.
+# Side Effects:
+# The following global variables can be set:
+# ssi_error - If an unrecoverable error occurred this becomes true.
+# It is up to the caller to initialize this to false
+# if desired.
+# ssi_last_error_resource - If an unrecoverable error occurred, this is the value
+# of the resource that could not be rendered by the ssi
+# call.
+# ssi_last_error - The error string fetched from the ssi response
+# in the event of an error.
+#
+sub ssi_with_retries {
+ my ($resource, $retries, %form) = @_;
+
+ my $target = $form{'grade_target'};
+ my $aom = $form{'answer_output_mode'};
+
+
+
+ my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form);
+ if (!$response->is_success) {
+ $ssi_error = 1;
+ $ssi_last_error_resource = $resource;
+ $ssi_last_error = $response->code . " " . $response->message;
+ $content='\section*{!!! An error occurred !!!}';
+ &Apache::lonnet::logthis("Error in SSI resource: $resource Error: $ssi_last_error");
+ }
+
+ return $content;
+
+}
+
+sub get_student_view_with_retries {
+ my ($curresline,$retries,$username,$userdomain,$courseid,$target,$moreenv)=@_;
+
+ my ($content, $response) = &Apache::loncommon::get_student_view_with_retries($curresline,$retries,$username,$userdomain,$courseid,$target,$moreenv);
+ if (!$response->is_success) {
+ $ssi_error = 1;
+ $ssi_last_error_resource = $curresline.' for user '.$username.':'.$userdomain;
+ $ssi_last_error = $response->code . " " . $response->message;
+ $content='\section*{!!! An error occurred !!!}';
+ &Apache::lonnet::logthis("Error in SSI (student view) resource: $curresline Error: $ssi_last_error User: $username:$userdomain");
+ }
+ return $content;
+
+}
+
+#
+# printf_style_subst item format_string repl
+#
+# Does printf style substitution for a format string that
+# can have %[n]item in it.. wherever, %[n]item occurs,
+# rep is substituted in format_string. Note that
+# [n] is an optional integer length. If provided,
+# repl is truncated to at most [n] characters prior to
+# substitution.
+#
+sub printf_style_subst {
+ my ($item, $format_string, $repl) = @_;
+ my $result = "";
+ while ($format_string =~ /(%)(\d*)\Q$item\E/g ) {
+ my $fmt = $1;
+ my $size = $2;
+ my $subst = $repl;
+ if ($size ne "") {
+ $subst = substr($subst, 0, $size);
+
+ # Here's a nice edge case.. supose the end of the
+ # substring is a \. In that case may have just
+ # chopped off a TeX escape... in that case, we append
+ # " " for the trailing character, and let the field
+ # spill over a bit (sigh).
+ # We don't just chop off the last character in order to deal
+ # with one last pathology, and that would be if substr had
+ # trimmed us to e.g. \\\
+
+
+ if ($subst =~ /\\$/) {
+ $subst .= " ";
+ }
+ }
+ my $item_pos = pos($format_string);
+ $result .= substr($format_string, 0, $item_pos - length($size) -2) . $subst;
+ $format_string = substr($format_string, pos($format_string));
+ }
+
+ # Put the residual format string into the result:
+
+ $result .= $format_string;
+
+ return $result;
+}
+
# Format a header according to a format.
#
@@ -58,21 +494,79 @@ my $resources_printed;
# %a - Assignment name.
# %c - Course name.
# %n - Student name.
+# %s - The section if it is supplied.
#
sub format_page_header {
- my ($format, $assignment, $course, $student) = @_;
-
+ my ($width, $format, $assignment, $course, $student, $section) = @_;
+
+
+
+ $width = &recalcto_mm($width); # Get width in mm.
+ my $chars_per_line = int($width/1.6); # Character/textline.
+
# Default format?
if ($format eq '') {
- $format = "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";
+ # For the default format, we may need to truncate
+ # elements.. To do this we need to get the page width.
+ # we assume that each character is about 2mm in width.
+ # (correct for the header text size??). We ignore
+ # any formatting (e.g. boldfacing in this).
+ #
+ # - Allow the student/course to be one line.
+ # but only truncate the course.
+ # - Allow the assignment to be 2 lines (wrapped).
+ #
+
- } else {
- $format =~ s/%a/$assignment/g;
- $format =~ s/%c/$course/g;
- $format =~ s/%n/$student/g;
+
+ my $name_length = int($chars_per_line *3 /4);
+ my $sec_length = int($chars_per_line / 5);
+
+ $format = "%$name_length".'n';
+
+ if ($section) {
+ $format .= ' - Sec: '."%$sec_length".'s';
+ }
+
+ $format .= '\\\\%c \\\\ %a';
+
+
}
+ # An open question is how to handle long user formatted page headers...
+ # A possible future is to support e.g. %na so that the user can control
+ # the truncation of the elements that can appear in the header.
+ #
+ $format = &printf_style_subst("a", $format, $assignment);
+ $format = &printf_style_subst("c", $format, $course);
+ $format = &printf_style_subst("n", $format, $student);
+ $format = &printf_style_subst("s", $format, $section);
+
+ # If the user put %'s in the format string, they must be escaped
+ # to \% else LaTeX will think they are comments and terminate
+ # the line.. which is bad!!!
+
+ # If the user has role author, $course and $assignment are empty so
+ # there is '\\ \\ ' in the page header. That's cause a error in LaTeX
+ if($format =~ /\\\\\s\\\\\s/) {
+ #TODO find sensible caption for page header
+ my $testPrintout = '\\\\'.&mt('Construction Space').' \\\\'.&mt('Test-Printout ');
+ $format =~ s/\\\\\s\\\\\s/$testPrintout/;
+ }
+ #
+ # We're going to trust LaTeX to break lines appropriately, but
+ # we'll truncate anything that's more than 3 lines worth of
+ # text. This is also assuming (which will probably end badly)
+ # nobody's going to embed LaTeX control sequences in the title
+ # header or rather that those control sequences won't get broken
+ # by the stuff below.
+ #
+ my $total_length = 3*$chars_per_line;
+ if (length($format) > $total_length) {
+ $format = substr($format, 0, $total_length);
+ }
+
return $format;
@@ -94,7 +588,7 @@ sub num_to_letters {
sub letters_to_num {
my ($letters) = @_;
my @letters = split('', uc($letters));
- my %substitution;
+ my %substitution;
my $digit = 0;
foreach my $letter ('A'..'J') {
$substitution{$letter} = $digit;
@@ -177,8 +671,8 @@ sub is_valid_alpha_code {
sub is_code_valid {
my ($code_value, $code_option) = @_;
my ($code_type, $code_length) = ('letter', 6); # defaults.
- open(FG, $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
- foreach my $line (<FG>) {
+ my @lines = &Apache::grades::get_scantronformat_file();
+ foreach my $line (@lines) {
my ($name, $type, $length) = (split(/:/, $line))[0,2,4];
if($name eq $code_option) {
$code_length = $length;
@@ -296,12 +790,19 @@ sub adjust_number_to_print {
# Unmodified.
} else {
# Error!!!!
-
+
croak "bad SPLIT_PDFS: $split_pdf in lonprintout::adjust_number_to_print";
+
}
}
+
sub character_chart {
+ my $result = shift;
+ return &Apache::entities::replace_entities($result);
+}
+
+sub old_character_chart {
my $result = shift;
$result =~ s/&\#0?0?(7|9);//g;
$result =~ s/&\#0?(10|13);//g;
@@ -409,7 +910,7 @@ sub character_chart {
$result =~ s/&\#147;/\`\`/g;
$result =~ s/&\#148;/\'\'/g;
$result =~ s/&\#149;/\\ensuremath\{\\bullet\}/g;
- $result =~ s/&\#150;/--/g;
+ $result =~ s/&(\#150|\#8211);/--/g;
$result =~ s/&\#151;/---/g;
$result =~ s/&\#152;/\\ensuremath\{\\sim\}/g;
$result =~ s/&\#153;/\\texttrademark /g;
@@ -423,7 +924,7 @@ sub character_chart {
$result =~ s/&(\#165|yen);/\\textyen /g;
$result =~ s/&(\#166|brvbar);/\\textbrokenbar /g;
$result =~ s/&(\#167|sect);/\\textsection /g;
- $result =~ s/&(\#168|uml);/\\texthighdieresis /g;
+ $result =~ s/&(\#168|uml);/\\"\{\} /g;
$result =~ s/&(\#169|copy);/\\copyright /g;
$result =~ s/&(\#170|ordf);/\\textordfeminine /g;
$result =~ s/&(\#172|not);/\\ensuremath\{\\neg\}/g;
@@ -434,7 +935,7 @@ sub character_chart {
$result =~ s/&(\#177|plusmn);/\\ensuremath\{\\pm\}/g;
$result =~ s/&(\#178|sup2);/\\ensuremath\{^2\}/g;
$result =~ s/&(\#179|sup3);/\\ensuremath\{^3\}/g;
- $result =~ s/&(\#180|acute);/\\textacute /g;
+ $result =~ s/&(\#180|acute);/\\'\{\} /g;
$result =~ s/&(\#181|micro);/\\ensuremath\{\\mu\}/g;
$result =~ s/&(\#182|para);/\\P/g;
$result =~ s/&(\#183|middot);/\\ensuremath\{\\cdot\}/g;
@@ -616,6 +1117,29 @@ sub character_chart {
$result =~ s/&(clubs|\#9827);/\\ensuremath\{\\clubsuit\}/g;
$result =~ s/&(hearts|\#9829);/\\ensuremath\{\\heartsuit\}/g;
$result =~ s/&(diams|\#9830);/\\ensuremath\{\\diamondsuit\}/g;
+# Chemically useful 'things' contributed by Hon Kie (bug 4652).
+
+ $result =~ s/&\#8636;/\\ensuremath\{\\leftharpoonup\}/g;
+ $result =~ s/&\#8637;/\\ensuremath\{\\leftharpoondown\}/g;
+ $result =~ s/&\#8640;/\\ensuremath\{\\rightharpoonup\}/g;
+ $result =~ s/&\#8641;/\\ensuremath\{\\rightharpoondown\}/g;
+ $result =~ s/&\#8652;/\\ensuremath\{\\rightleftharpoons\}/g;
+ $result =~ s/&\#8605;/\\ensuremath\{\\leadsto\}/g;
+ $result =~ s/&\#8617;/\\ensuremath\{\\hookleftarrow\}/g;
+ $result =~ s/&\#8618;/\\ensuremath\{\\hookrightarrow\}/g;
+ $result =~ s/&\#8614;/\\ensuremath\{\\mapsto\}/g;
+ $result =~ s/&\#8599;/\\ensuremath\{\\nearrow\}/g;
+ $result =~ s/&\#8600;/\\ensuremath\{\\searrow\}/g;
+ $result =~ s/&\#8601;/\\ensuremath\{\\swarrow\}/g;
+ $result =~ s/&\#8598;/\\ensuremath\{\\nwarrow\}/g;
+
+ # Left/right quotations:
+
+ $result =~ s/&(ldquo|#8220);/\`\`/g;
+ $result =~ s/&(rdquo|#8221);/\'\'/g;
+
+
+
return $result;
}
@@ -624,18 +1148,18 @@ sub character_chart {
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']
+ '1' => [ '7.1 in','9.8 in', '-0.57 in','-0.57 in','0.275 in'],
+ '2' => ['3.66 in','9.8 in', '-0.57 in','-0.57 in','0.275 in']
},
'album' => {
- '1' => [ '8.8 in', '6.8 in','-0.55 in', '-0.83 in','1 cm'],
- '2' => [ '4.4 in', '6.8 in','-0.5 in', '-1.5 in','3.5 in']
+ '1' => [ '8.8 in', '6.8 in','-0.55 in', '-0.55 in','0.394 in'],
+ '2' => [ '4.8 in', '6.8 in','-0.5 in', '-1.0 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']
+ '2' => ['3.66 in','13 in','-0.57 in','-0.57 in','-0.5 in']
},
'album' => {
'1' => ['12 in','7.1 in',,'-0.57 in','-0.57 in','-0.5 in'],
@@ -684,12 +1208,12 @@ my %page_formats=
},
'a4' => {
'book' => {
- '1' => ['17.6 cm','27.2 cm','-0.55 in','-0.83 in','-0.5 in'],
- '2' => [ '9.1 cm','27.2 cm','-0.55 in','-0.83 in','-0.5 in']
+ '1' => ['17.6 cm','27.2 cm','-1.397 cm','-2.11 cm','-1.27 cm'],
+ '2' => [ '9.1 cm','27.2 cm','-1.397 cm','-2.11 cm','-1.27 cm']
},
'album' => {
- '1' => ['8.5 in','7.7 in','-0.55 in','-0.83 in','0 in'],
- '2' => ['3.9 in','7.7 in','-0.55 in','-0.83 in','0 in']
+ '1' => ['21.59 cm','19.558 cm','-1.397cm','-2.11 cm','0 cm'],
+ '2' => ['9.91 cm','19.558 cm','-1.397 cm','-2.11 cm','0 cm']
},
},
'a5' => {
@@ -741,6 +1265,8 @@ sub get_course {
my $courseidinfo;
if (defined($env{'request.course.id'})) {
$courseidinfo = &Apache::lonxml::latex_special_symbols(&unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
+ my $sec = $env{'request.course.sec'};
+
}
return $courseidinfo;
}
@@ -750,7 +1276,11 @@ sub page_format_transformation {
my ($textwidth,$textheight,$oddoffset,$evenoffset,$topmargin);
if ($selectionmade eq '4') {
- $assignment='Problems from the Whole Course';
+ if ($choice eq 'all_problems') {
+ $assignment=&mt('Problems from the Whole Course');
+ } else {
+ $assignment=&mt('Resources from the Whole Course');
+ }
} else {
$assignment=&Apache::lonxml::latex_special_symbols($assignment,'header');
}
@@ -759,9 +1289,8 @@ sub page_format_transformation {
my $name = &get_name();
my $courseidinfo = &get_course();
- if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
my $header_text = $parmhash{'print_header_format'};
- $header_text = &format_page_header($header_text, $assignment,
+ $header_text = &format_page_header($textwidth, $header_text, $assignment,
$courseidinfo, $name);
my $topmargintoinsert = '';
if ($topmargin ne '0') {$topmargintoinsert='\setlength{\topmargin}{'.$topmargin.'}';}
@@ -772,12 +1301,12 @@ sub page_format_transformation {
$fancypagestatement="\\rhead{}\\chead{}\\lhead{$header_text}";
}
if ($layout eq 'album') {
- $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 /;
+ $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\\usepackage{booktabs}\\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 $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/;
+ $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\\usepackage{booktabs}\\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\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 /;
+ $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{}\\usepackage{booktabs}\\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}/;
@@ -812,6 +1341,8 @@ sub details_for_menu {
if (!$postdata) { $postdata=$helper->{VARS}{'postdata'}; }
my $name_of_resource = &Apache::lonnet::gettitle($postdata);
my $symbolic = &Apache::lonnet::symbread($postdata);
+ return if ( $symbolic eq '');
+
my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
$map=&Apache::lonnet::clutter($map);
my $name_of_sequence = &Apache::lonnet::gettitle($map);
@@ -898,30 +1429,8 @@ sub IndexCreation {
sub print_latex_header {
my $mode=shift;
- my $output='\documentclass[letterpaper,twoside]{article}\raggedbottom';
- if (($mode eq 'batchmode') || (!$perm{'pav'})) {
- $output.='\batchmode';
- }
- $output.='\newcommand{\keephidden}[1]{}\renewcommand{\deg}{$^{\circ}$}'."\n".
- '\usepackage{multirow}'."\n".
- '\usepackage{longtable}\usepackage{textcomp}\usepackage{makeidx}'."\n".
- '\usepackage[dvips]{graphicx}\usepackage{epsfig}'."\n".
- '\usepackage{wrapfig}'.
- '\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;
+
+ return &Apache::londefdef::latex_header($mode);
}
sub path_to_problem {
@@ -992,6 +1501,185 @@ sub unsupported {
return $result;
}
+#
+# Map from helper layout style to the book/album:
+#
+sub map_laystyle {
+ my ($laystyle) = @_;
+ if ($laystyle eq 'L') {
+ $laystyle='album';
+ } else {
+ $laystyle='book';
+ }
+ return $laystyle;
+}
+
+sub print_page_in_course {
+ my ($helper, $rparmhash, $currentURL, $resources) = @_;
+ my %parmhash = %$rparmhash;
+ my @page_resources = @$resources;
+ my $mode = $helper->{'VARS'}->{'LATEX_TYPE'};
+ my $symb = $helper->{'VARS'}->{'symb'};
+
+
+ my $format_from_helper = $helper->{'VARS'}->{'FORMAT'};
+
+
+ my @temporary_array=split /\|/,$format_from_helper;
+ my ($laystyle,$numberofcolumns,$papersize,$pdfFormFields)=@temporary_array;
+ $laystyle = &map_laystyle($laystyle);
+ my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,
+ $numberofcolumns);
+ my $LaTeXwidth=&recalcto_mm($textwidth);
+
+
+ if ($mode ne '') {$mode='\\'.$mode}
+ my $result = &print_latex_header($mode);
+ if ($currentURL=~m|^(/adm/wrapper/)?ext/|) {
+ $currentURL=~s|^(/adm/wrapper/)?ext/|http://|;
+ my $title=&Apache::lonnet::gettitle($symb);
+ $title = &Apache::lonxml::latex_special_symbols($title);
+ } else {
+ $result.=$currentURL;
+ }
+ $result .= '\\\\';
+
+ if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
+ &Apache::lonnet::appenv({'construct.style' =>
+ $helper->{'VARS'}->{'style_file'}});
+ } elsif ($env{'construct.style'}) {
+ &Apache::lonnet::delenv('construct.style');
+ }
+
+ # First is the overall page description. This is then followed by the
+ # components of the page. Each of which must be printed independently.
+ my $the_page = shift(@page_resources);
+
+
+ foreach my $resource (@page_resources) {
+ my $resource_src = $resource->src(); # Essentially the URL of the resource.
+ $result .= $resource->title() . '\\\\';
+
+ # Recurse if a .page:
+
+ if ($resource_src =~ /.page$/i) {
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ my @page_resources = $navmap->retrieveResources($resource_src);
+ $result .= &print_page_in_course($helper, $rparmhash,
+ $resource_src, \@page_resources);
+ }
+ # these resources go through the XML transformer:
+
+ elsif ($resource_src =~ /\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm\xhtml|xhtm)$/) {
+ my $urlp = &Apache::lonnet::clutter($resource_src);
+ my %form;
+ my %moreenv;
+
+ &Apache::lonxml::remember_problem_counter();
+ $moreenv{'request.filename'}=$urlp;
+ if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
+
+ $form{'grade_target'} = 'tex';
+ $form{'textwidth'} = &get_textwidth($helper, $LaTeXwidth);
+ $form{'pdfFormFiels'} = $pdfFormFields; #
+ $form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};
+
+ $form{'problem_split'}=$parmhash{'problem_stream_switch'};
+ $form{'suppress_tries'}=$parmhash{'suppress_tries'};
+ $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
+ $form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
+ $form{'print_annotations'}=$helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
+ if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') ||
+ ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
+ $form{'problem_split'}='yes';
+ }
+ my $rndseed = time;
+ if ($helper->{'VARS'}->{'curseed'}) {
+ $rndseed=$helper->{'VARS'}->{'curseed'};
+ }
+ $form{'rndseed'}=$rndseed;
+ &Apache::lonnet::appenv(\%moreenv);
+
+ &Apache::lonxml::clear_problem_counter();
+
+ my $texversion = &ssi_with_retries($urlp, $ssi_retry_count, %form);
+
+
+ # current document with answers.. no need to encap in minipage
+ # since there's only one answer.
+
+ if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
+ ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
+ my %answerform = %form;
+
+
+ $answerform{'problem_split'}=$parmhash{'problem_stream_switch'};
+ $answerform{'grade_target'}='answer';
+ $answerform{'answer_output_mode'}='tex';
+ $answerform{'rndseed'}=$rndseed;
+ if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {
+ $answerform{'problemtype'}='exam';
+ }
+ $resources_printed .= $urlp.':';
+ my $answer=&ssi_with_retries($urlp,$ssi_retry_count, %answerform);
+
+ if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
+ $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
+ } else {
+ $texversion= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+ if ($helper->{'VARS'}->{'construction'} ne '1') {
+ my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});
+ $title = &Apache::lonxml::latex_special_symbols($title);
+ $texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
+ $texversion.=&path_to_problem($urlp,$LaTeXwidth);
+ } else {
+ $texversion.='\vskip 0 mm \noindent\textbf{Prints from construction space - there is no title.}\vskip 0 mm ';
+ my $URLpath=$urlp;
+ $URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
+ $texversion.=&path_to_problem($URLpath,$LaTeXwidth);
+ }
+ $texversion.='\vskip 1 mm '.$answer.'\end{document}';
+ }
+
+
+
+
+
+ }
+ # Print annotations.
+
+
+ if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+ my $annotation .= &annotate($currentURL);
+ $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ }
+
+ if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
+ $texversion=&IndexCreation($texversion,$currentURL);
+ }
+ if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
+ $texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$currentURL| \\strut\\\\\\strut /;
+
+ }
+ $texversion = &latex_header_footer_remove($texversion);
+
+ # the first remaining line is a comment from londefdef the second
+ # line seems to be an extraneous \vskip 1mm \\\\ :
+ # (imperfect removal from header_footer_remove?
+
+ $texversion =~ s/\\vskip 1mm \\\\\\\\//;
+
+ $result .= $texversion;
+ if ($currentURL=~m/\.page\s*$/) {
+ ($result,$numberofcolumns) = &page_cleanup($result);
+ }
+ }
+ }
+
+ $result.= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill} \end{document}';
+ return $result;
+}
+
#
# List of recently generated print files
@@ -1019,20 +1707,43 @@ sub recently_generated {
$cuid,$cgid,$crdev,$csize,
$catime,$cmtime,$cctime,
$cblksize,$cblocks)=stat($prtspool.'/'.$filename);
- my $result="<a href='/prtspool/$filename'>".
- &mt('Generated [_1] ([_2] bytes)',
- &Apache::lonlocal::locallocaltime($cctime),$csize).
- '</a><br />';
+ my $ext_text = 'pdf' ? &mt('PDF File'):&mt('Zip File');
+ my $result=&Apache::loncommon::start_data_table_row()
+ .'<td>'
+ .'<a href="/prtspool/'.$filename.'">'.$ext_text.'</a>'
+ .'</td>'
+ .'<td>'.&Apache::lonlocal::locallocaltime($cctime).'</td>'
+ .'<td align="right">'.$csize.'</td>'
+ .&Apache::loncommon::end_data_table_row();
if ($ext eq 'pdf') { $pdf_result .= $result; }
if ($ext eq 'zip') { $zip_result .= $result; }
}
+ if ($zip_result || $pdf_result) {
+ $r->print('<hr />');
+ }
if ($zip_result) {
- $r->print('<h4>'.&mt('Recently generated printout zip files')."</h4>\n"
- .$zip_result);
+ $r->print('<h3>'.&mt('Recently generated printout zip files')."</h3>\n"
+ .&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .'<th>'.&mt('Download').'</th>'
+ .'<th>'.&mt('Creation Date').'</th>'
+ .'<th>'.&mt('File Size (Bytes)').'</th>'
+ .&Apache::loncommon::end_data_table_header_row()
+ .$zip_result
+ .&Apache::loncommon::end_data_table()
+ );
}
if ($pdf_result) {
- $r->print('<h4>'.&mt('Recently generated printouts')."</h4>\n"
- .$pdf_result);
+ $r->print('<h3>'.&mt('Recently generated printouts')."</h3>\n"
+ .&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .'<th>'.&mt('Download').'</th>'
+ .'<th>'.&mt('Creation Date').'</th>'
+ .'<th>'.&mt('File Size (Bytes)').'</th>'
+ .&Apache::loncommon::end_data_table_header_row()
+ .$pdf_result
+ .&Apache::loncommon::end_data_table()
+ );
}
}
@@ -1045,7 +1756,7 @@ sub recently_generated {
# A reference to a page break hash.
#
#
-#use Data::Dumper;
+# use Data::Dumper;
#sub dump_helper_vars {
# my ($helper) = @_;
# my $helpervars = Dumper($helper->{'VARS'});
@@ -1082,12 +1793,12 @@ sub print_construction_sequence {
if ($helper->{'VARS'}->{'curseed'}) {
$rndseed=$helper->{'VARS'}->{'curseed'};
}
- my $errtext=&Apache::lonratedt::mapread($currentURL);
+ my $errtext=&LONCAPA::map::mapread($currentURL);
#
# These make this all support recursing for subsequences.
#
- my @order = @Apache::lonratedt::order;
- my @resources = @Apache::lonratedt::resources;
+ my @order = @LONCAPA::map::order;
+ my @resources = @LONCAPA::map::resources;
for (my $member=0;$member<=$#order;$member++) {
$resources[$order[$member]]=~/^([^:]*):([^:]*):/;
my $urlp=$2;
@@ -1099,7 +1810,7 @@ sub print_construction_sequence {
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
$form{'rndseed'}=$rndseed;
$resources_printed .=$urlp.':';
- $texversion=&Apache::lonnet::ssi($urlp,%form);
+ $texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);
}
if((($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) &&
@@ -1112,14 +1823,16 @@ sub print_construction_sequence {
$answerform{'problem_split'}=$parmhash{'problem_stream_switch'};
if ($urlp=~/\/res\//) {$env{'request.state'}='published';}
$resources_printed .= $urlp.':';
- my $answer=&Apache::lonnet::ssi($urlp,%answerform);
+ my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
} else {
# If necessary, encapsulate answer in minipage:
$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
- my $body ='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'}).'}\vskip 0 mm ';
+ my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});
+ $title = &Apache::lonxml::latex_special_symbols($title);
+ my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
$body.=&path_to_problem($urlp,$LaTeXwidth);
$body.='\vskip 1 mm '.$answer.'\end{document}';
$body = &encapsulate_minipage($body);
@@ -1137,7 +1850,7 @@ sub print_construction_sequence {
$result.=$texversion;
} elsif ($urlp=~/\.(sequence|page)$/) {
-
+
# header:
$result.='\strut\newline\noindent Sequence/page '.$urlp.'\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent ';
@@ -1156,7 +1869,21 @@ sub print_construction_sequence {
$helper, %form,
$LaTeXwidth);
}
- }
+ }
+ elsif ($urlp =~ /\.pdf$/i) {
+ my $texversion;
+ if ($member != 0) {
+ $texversion .= '\cleardoublepage';
+ }
+
+ $texversion .= &include_pdf($urlp);
+ $texversion = &latex_header_footer_remove($texversion);
+ if ($member != $#order) {
+ $texversion .= '\\ \cleardoublepage';
+ }
+
+ $result .= $texversion;
+ }
}
if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
return $result;
@@ -1165,7 +1892,10 @@ sub print_construction_sequence {
sub output_data {
my ($r,$helper,$rparmhash) = @_;
my %parmhash = %$rparmhash;
+ $ssi_error = 0; # This will be set nonzero by failing ssi's.
$resources_printed = '';
+ $font_size = $helper->{'VARS'}->{'fontsize'};
+ my $do_postprocessing = 1;
my $js = <<ENDPART;
<script type="text/javascript">
var editbrowser;
@@ -1193,7 +1923,17 @@ sub output_data {
</script>
ENDPART
- my $start_page = &Apache::loncommon::start_page('Preparing Printout',$js);
+
+ # Breadcrumbs
+ #FIXME: Choose better/different breadcrumbs?!? Links?
+ my $brcrum = [{'href' => '',
+ 'text' => 'Helper'}, #FIXME: Different origin possible than print out helper?
+ {'href' => '',
+ 'text' => 'Preparing Printout'}];
+
+ my $start_page = &Apache::loncommon::start_page('Preparing Printout',
+ $js,
+ {'bread_crumbs' => $brcrum,});
my $msg = &mt('Please stand by while processing your print request, this may take some time ...');
$r->print($start_page."\n<p>\n$msg\n</p>\n");
@@ -1214,18 +1954,16 @@ ENDPART
my ($result,$selectionmade) = ('','');
my $number_of_columns = 1; #used only for pages to determine the width of the cell
my @temporary_array=split /\|/,$format_from_helper;
- my ($laystyle,$numberofcolumns,$papersize)=@temporary_array;
- if ($laystyle eq 'L') {
- $laystyle='album';
- } else {
- $laystyle='book';
- }
+ my ($laystyle,$numberofcolumns,$papersize,$pdfFormFields)=@temporary_array;
+
+ $laystyle = &map_laystyle($laystyle);
my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$laystyle,$numberofcolumns);
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
@@ -1234,6 +1972,7 @@ ENDPART
my %form;
$form{'grade_target'} = 'tex';
$form{'textwidth'} = &get_textwidth($helper, $LaTeXwidth);
+ $form{'pdfFormFields'} = $pdfFormFields;
# If form.showallfoils is set, then request all foils be shown:
# privilege will be enforced both by not allowing the
@@ -1245,6 +1984,14 @@ ENDPART
if ($helper->{'VARS'}->{'showallfoils'} eq "1") {
$form{'showallfoils'} = $helper->{'VARS'}->{'showallfoils'};
}
+
+ if ($helper->{'VARS'}->{'style_file'}=~/\w/) {
+ &Apache::lonnet::appenv({'construct.style' =>
+ $helper->{'VARS'}->{'style_file'}});
+ } elsif ($env{'construct.style'}) {
+ &Apache::lonnet::delenv('construct.style');
+ }
+
if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
#-- single document - problem, page, html, xml, ...
@@ -1255,6 +2002,7 @@ ENDPART
$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;}
@@ -1262,35 +2010,35 @@ ENDPART
}
$selectionmade = 1;
if ($cleanURL!~m|^/adm/|
- && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
+ && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) {
my $rndseed=time;
my $texversion='';
if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
my %moreenv;
$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 $put_result = &Apache::lonnet::put('environment',{'construct.style'=>$helper->{'VARS'}->{'style_file'}},$dom,$user);
- }
if ($helper->{'VARS'}->{'probstatus'} eq 'exam') {$form{'problemtype'}='exam';}
$form{'problem_split'}=$parmhash{'problem_stream_switch'};
$form{'suppress_tries'}=$parmhash{'suppress_tries'};
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
$form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
- if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$form{'problem_split'}='yes';}
+ $form{'print_annotations'}=$helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
+ if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') ||
+ ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
+ $form{'problem_split'}='yes';
+ }
if ($helper->{'VARS'}->{'curseed'}) {
$rndseed=$helper->{'VARS'}->{'curseed'};
}
$form{'rndseed'}=$rndseed;
- &Apache::lonnet::appenv(%moreenv);
+ &Apache::lonnet::appenv(\%moreenv);
&Apache::lonxml::clear_problem_counter();
$resources_printed .= $currentURL.':';
- $texversion.=&Apache::lonnet::ssi($currentURL,%form);
+ $texversion.=&ssi_with_retries($currentURL,$ssi_retry_count, %form);
+ # Add annotations if required:
+
&Apache::lonxml::clear_problem_counter();
&Apache::lonnet::delenv('request.filename');
@@ -1308,23 +2056,41 @@ ENDPART
$form{'problemtype'}='exam';
}
$resources_printed .= $currentURL.':';
- my $answer=&Apache::lonnet::ssi($currentURL,%form);
+ my $answer=&ssi_with_retries($currentURL,$ssi_retry_count, %form);
+
+
if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
} else {
$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 ';
+ my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});
+ $title = &Apache::lonxml::latex_special_symbols($title);
+ $texversion.='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
$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=$cleanURL;
$URLpath=~s/~([^\/]+)/public_html\/$1\/$1/;
- $texversion.=&path_to_problem ($URLpath,$LaTeXwidth);
+ $texversion.=&path_to_problem($URLpath,$LaTeXwidth);
}
$texversion.='\vskip 1 mm '.$answer.'\end{document}';
}
+
+
+
+
+
}
+ # Print annotations.
+
+
+ if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+ my $annotation .= &annotate($currentURL);
+ $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ }
+
+
if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
$texversion=&IndexCreation($texversion,$currentURL);
}
@@ -1337,10 +2103,12 @@ ENDPART
($result,$number_of_columns) = &page_cleanup($result);
}
} elsif ($cleanURL!~m|^/adm/|
- && $currentURL=~/\.sequence$/ && $helper->{'VARS'}->{'construction'} eq '1') {
+ && $currentURL=~/\.(sequence|page)$/ && $helper->{'VARS'}->{'construction'} eq '1') {
#printing content of sequence from the construction space
+
+
$currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
- $result .= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+# $result .= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
$result .= &print_construction_sequence($currentURL, $helper, %form,
$LaTeXwidth);
$result .= '\end{document}';
@@ -1352,23 +2120,64 @@ ENDPART
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
$resources_printed .= $currentURL.':';
- my $texversion=&Apache::lonnet::ssi($currentURL,%form);
+ my $texversion = &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+ $texversion .= &ssi_with_retries($currentURL, $ssi_retry_count, %form);
+ if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+ my $annotation = &annotate($currentURL);
+ $texversion =~ s/(\\end{document})/$annotation$1/;
+ }
$result .= $texversion;
+ } elsif ($cleanURL =~/\.tex$/) {
+ # For this sort of print of a single LaTeX file,
+ # We can just print the LaTeX file as it is uninterpreted in any way:
+ #
+
+ $result = &fetch_raw_resource($currentURL);
+ if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+ my $annotation = &annotate($currentURL);
+ $result =~ s/(\\end{document})/$annotation$1/;
+ }
+
+ $do_postprocessing = 0; # Don't massage the result.
+
+ } elsif ($cleanURL =~ /\.pdf$/i) {
+ $result .= &include_pdf($cleanURL);
+ $result .= '\end{document}';
+ } elsif ($cleanURL =~ /\.page$/i) { # Print page in non construction space contexts.
+
+ # Determine the set of resources in the map of the page:
+
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ my @page_resources = $navmap->retrieveResources($cleanURL);
+ $result .= &print_page_in_course($helper, $rparmhash,
+ $cleanURL, \@page_resources);
+
+
} else {
+ &Apache::lonnet::logthis("Unsupported type handler");
$result.=&unsupported($currentURL,$helper->{'VARS'}->{'LATEX_TYPE'},
$helper->{'VARS'}->{'symb'});
}
} elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page') or
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_resources_in_page') or
($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') 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')) {
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')
+ ) {
+
+
#-- produce an output string
- if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') {
+ if (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') or
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page') ) {
$selectionmade = 2;
- } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') {
+ } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_resources_in_page'))
+ {
$selectionmade = 3;
- } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') {
+ } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')
+ ) {
$selectionmade = 4;
} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources') { #BUGBUG
$selectionmade = 4;
@@ -1379,7 +2188,11 @@ ENDPART
$form{'suppress_tries'}=$parmhash{'suppress_tries'};
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
$form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
- if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$form{'problem_split'}='yes';}
+ $form{'print_annotations'} = $helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
+ if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') ||
+ ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') ) {
+ $form{'problem_split'}='yes';
+ }
my $flag_latex_header_remove = 'NO';
my $flag_page_in_sequence = 'NO';
my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
@@ -1390,6 +2203,9 @@ ENDPART
my $pbreakresources = keys %page_breaks;
for (my $i=0;$i<=$#master_seq;$i++) {
+ &Apache::lonenc::reset_enc();
+
+
# Note due to document structure, not allowed to put \newpage
# prior to the first resource
@@ -1398,20 +2214,21 @@ ENDPART
$result.="\\newpage\n";
}
}
- my ($sequence,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
+ my ($sequence,$middle_thingy,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
$urlp=&Apache::lonnet::clutter($urlp);
$form{'symb'}=$master_seq[$i];
my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #title of the assignment which contains this problem
+
if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}
if ($i==0) {$prevassignment=$assignment;}
my $texversion='';
if ($urlp!~m|^/adm/|
&& $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
$resources_printed .= $urlp.':';
-
&Apache::lonxml::remember_problem_counter();
- $texversion.=&Apache::lonnet::ssi($urlp,%form);
+ $texversion.=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'}); # RF
+ $texversion.=&ssi_with_retries($urlp, $ssi_retry_count, %form);
if ($urlp=~/\.page$/) {
($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;}
@@ -1428,14 +2245,17 @@ ENDPART
$resources_printed .= $urlp.':';
&Apache::lonxml::restore_problem_counter();
- my $answer=&Apache::lonnet::ssi($urlp,%answerform);
+ my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
} else {
if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
$texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
- my $body ='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($master_seq[$i]).'}\vskip 0 mm ';
+ $texversion =~ s/\\begin{document}//;
+ my $title = &Apache::lonnet::gettitle($master_seq[$i]);
+ $title = &Apache::lonxml::latex_special_symbols($title);
+ my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
$body .= &path_to_problem ($urlp,$LaTeXwidth);
$body .='\vskip 1 mm '.$answer;
$body = &encapsulate_minipage($body);
@@ -1444,7 +2264,13 @@ ENDPART
$texversion='';
}
}
+
}
+ if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+ my $annotation .= &annotate($urlp);
+ $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ }
+
if ($flag_latex_header_remove ne 'NO') {
$texversion = &latex_header_footer_remove($texversion);
} else {
@@ -1456,13 +2282,13 @@ ENDPART
if (($selectionmade == 4) and ($assignment ne $prevassignment)) {
my $name = &get_name();
my $courseidinfo = &get_course();
- if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
$prevassignment=$assignment;
my $header_text = $parmhash{'print_header_format'};
- $header_text = &format_page_header($header_text,
+ $header_text = &format_page_header($textwidth, $header_text,
$assignment,
$courseidinfo,
$name);
+
if ($numberofcolumns eq '1') {
$result .='\newpage \noindent\parbox{\minipagewidth}{\noindent\\lhead{'.$header_text.'}} \vskip 5 mm ';
} else {
@@ -1475,14 +2301,37 @@ ENDPART
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
$resources_printed .= $urlp.':';
- my $texversion=&Apache::lonnet::ssi($urlp,%form);
+ my $texversion = &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
+ $texversion .= &ssi_with_retries($urlp, $ssi_retry_count, %form);
+ if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+ my $annotation = &annotate($urlp);
+ $texversion =~ s/(\\end{document)/$annotation$1/;
+ }
+
if ($flag_latex_header_remove ne 'NO') {
$texversion = &latex_header_footer_remove($texversion);
- } else {
+ } else {
$texversion =~ s/\\end{document}/\\vskip 0\.5mm\\noindent\\makebox\[\\textwidth\/\$number_of_columns\]\[b\]\{\\hrulefill\}/;
}
$result .= $texversion;
$flag_latex_header_remove = 'YES';
+ } elsif ($urlp=~ /\.pdf$/i) {
+ if ($i > 0) {
+ $result .= '\cleardoublepage';
+ }
+ $result .= &include_pdf($urlp);
+ if ($i != $#master_seq) {
+ if ($numberofcolumns eq '1') {
+ $result .= '\newpage';
+ } else {
+ # the \\'s seem to be needed to let LaTeX know there's something
+ # on the page since LaTeX seems to not like to clear an empty page.
+ #
+ $result .= '\\ \cleardoublepage';
+ }
+ }
+ $flag_latex_header_remove = 'YES';
+
} else {
$texversion=&unsupported($urlp,$helper->{'VARS'}->{'LATEX_TYPE'},
$master_seq[$i]);
@@ -1494,7 +2343,9 @@ ENDPART
$result .= $texversion;
$flag_latex_header_remove = 'YES';
}
- if (&Apache::loncommon::connection_aborted($r)) { last; }
+ if (&Apache::loncommon::connection_aborted($r)) {
+ last;
+ }
}
&Apache::lonxml::clear_problem_counter();
if ($flag_page_in_sequence eq 'YES') {
@@ -1502,12 +2353,16 @@ ENDPART
}
$result .= '\end{document}';
} elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students_from_page') ||
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_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') {
+ if (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students') ||
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'problems_for_students_from_page') ||
+ ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems_students') ) {
$selectionmade=5;
$type='problems';
} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'resources_for_students') {
@@ -1546,14 +2401,19 @@ ENDPART
my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
#loop over students
- my $flag_latex_header_remove = 'NO';
+
+ 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{'print_annotations'} = $helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
$moreenv{'problem_split'} = $parmhash{'problem_stream_switch'};
$moreenv{'suppress_tries'} = $parmhash{'suppress_tries'};
- if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}
+ if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') ||
+ ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
+ $moreenv{'problem_split'}='yes';
+ }
my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
my $student_counter=-1;
my $i = 0;
@@ -1590,6 +2450,7 @@ ENDPART
&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 'problems_for_anon_page') ||
($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'};
@@ -1600,9 +2461,9 @@ ENDPART
my $selected_code = $helper->{'VARS'}->{'CODE_SELECTED_FROM_LIST'};
my $code_option=$helper->{'VARS'}->{'CODE_OPTION'};
- open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+ my @lines = &Apache::grades::get_scantronformat_file();
my ($code_type,$code_length)=('letter',6);
- foreach my $line (<FH>) {
+ foreach my $line (@lines) {
my ($name,$type,$length) = (split(/:/,$line))[0,2,4];
if ($name eq $code_option) {
$code_length=$length;
@@ -1693,6 +2554,9 @@ ENDPART
$rndseed=$helper->{'VARS'}->{'curseed'};
}
for (my $i=0;$i<=$#list_of_files;$i++) {
+
+ &Apache::lonenc::reset_enc();
+
my $urlp = $list_of_files[$i];
$urlp=~s|//|/|;
if ($urlp=~/\//) {
@@ -1704,7 +2568,7 @@ ENDPART
$urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
}
$resources_printed .= $urlp.':';
- my $texversion=&Apache::lonnet::ssi($urlp,%form);
+ my $texversion=&ssi_with_retries($urlp, $ssi_retry_count, %form);
if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
# Don't permanently pervert %form:
@@ -1714,7 +2578,7 @@ ENDPART
$answerform{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
$answerform{'rndseed'}=$rndseed;
$resources_printed .= $urlp.':';
- my $answer=&Apache::lonnet::ssi($urlp,%answerform);
+ my $answer=&ssi_with_retries($urlp, $ssi_retry_count, %answerform);
if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
} else {
@@ -1731,7 +2595,8 @@ ENDPART
$texversion.='\vskip 1 mm '.$answer.'\end{document}';
}
}
- #this chunck is responsible for printing the path to problem
+ #this chunk is responsible for printing the path to problem
+
my $newurlp=$urlp;
if ($newurlp=~/~/) {$newurlp=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;}
$newurlp=&path_to_problem($newurlp,$LaTeXwidth);
@@ -1756,113 +2621,139 @@ ENDPART
$result .= '\end{document}';
}
#-------------------------------------------------------- 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,$selectionmade,
- $helper->{'VARS'}->{'ANSWER_TYPE'});
- #if ($numberofcolumns == 1) {
+
+ # Only post process if that has not been turned off e.g. by a raw latex resource.
+
+ if ($do_postprocessing) {
+ $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,$selectionmade,
+ $helper->{'VARS'}->{'ANSWER_TYPE'});
+ #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'} /;
- #}
+ #}
+ }
+
+ # Set URLback if this is a construction space print so we can provide
+ # a link to the resource being edited.
+ #
+
+ my $URLback=''; #link to original document
+ if ($helper->{'VARS'}->{'construction'} eq '1') {
+ #prints resource from the construction space
+ $URLback='/'.$helper->{'VARS'}->{'filename'};
+ if ($URLback=~/([^?]+)/) {
+ $URLback=$1;
+ $URLback=~s|^/~|/priv/|;
+ }
+ }
+ #
+ # Final adjustment of the font size:
+ #
+
+ $result = set_font_size($result);
#-- 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";
if (!($#print_array>0)) {
- unless ($temp_file = Apache::File->new('>'.$filename)) {
- $r->log_error("Couldn't open $filename for output $!");
- return SERVER_ERROR;
- }
- print $temp_file $result;
- my $begin=index($result,'\begin{document}',0);
- my $inc=substr($result,0,$begin+16);
+ unless ($temp_file = Apache::File->new('>'.$filename)) {
+ $r->log_error("Couldn't open $filename for output $!");
+ return SERVER_ERROR;
+ }
+ print $temp_file $result;
+ my $begin=index($result,'\begin{document}',0);
+ my $inc=substr($result,0,$begin+16);
} else {
- my $begin=index($result,'\begin{document}',0);
- my $inc=substr($result,0,$begin+16);
- for (my $i=0;$i<=$#print_array;$i++) {
- if ($i==0) {
- $print_array[$i]=$result;
- } else {
- $print_array[$i].='\end{document}';
- $print_array[$i] =
- &latex_corrections($number_of_columns,$print_array[$i],
- $selectionmade,
- $helper->{'VARS'}->{'ANSWER_TYPE'});
-
- my $anobegin=index($print_array[$i],'\setcounter{page}',0);
- substr($print_array[$i],0,$anobegin)='';
- $print_array[$i]=$inc.$print_array[$i];
- }
- my $temp_file;
- my $newfilename=$filename;
- my $num=$i+1;
- $newfilename =~s/\.tex$//;
- $newfilename=sprintf("%s_%03d.tex",$newfilename, $num);
- unless ($temp_file = Apache::File->new('>'.$newfilename)) {
- $r->log_error("Couldn't open $newfilename for output $!");
- return SERVER_ERROR;
- }
- print $temp_file $print_array[$i];
- }
+ my $begin=index($result,'\begin{document}',0);
+ my $inc=substr($result,0,$begin+16);
+ for (my $i=0;$i<=$#print_array;$i++) {
+ if ($i==0) {
+ $print_array[$i]=$result;
+ } else {
+ $print_array[$i].='\end{document}';
+ $print_array[$i] =
+ &latex_corrections($number_of_columns,$print_array[$i],
+ $selectionmade,
+ $helper->{'VARS'}->{'ANSWER_TYPE'});
+
+ my $anobegin=index($print_array[$i],'\setcounter{page}',0);
+ substr($print_array[$i],0,$anobegin)='';
+ $print_array[$i]=$inc.$print_array[$i];
+ }
+ my $temp_file;
+ my $newfilename=$filename;
+ my $num=$i+1;
+ $newfilename =~s/\.tex$//;
+ $newfilename=sprintf("%s_%03d.tex",$newfilename, $num);
+ unless ($temp_file = Apache::File->new('>'.$newfilename)) {
+ $r->log_error("Couldn't open $newfilename for output $!");
+ return SERVER_ERROR;
+ }
+ print $temp_file $print_array[$i];
+ }
}
my $student_names='';
if ($#print_array>0) {
- for (my $i=0;$i<=$#print_array;$i++) {
- $student_names.=$student_names[$i].'_ENDPERSON_';
+ for (my $i=0;$i<=$#print_array;$i++) {
+ $student_names.=$student_names[$i].'_ENDPERSON_';
}
} else {
if ($#student_names>-1) {
- $student_names=$student_names[0].'_ENDPERSON_';
+ $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).
- '_ENDPERSON_'.'_END_';
- }
- }
-
- my $URLback=''; #link to original document
- if ($helper->{'VARS'}->{'construction'} ne '1') {
- #prints published resource
- $URLback=&escape('/adm/flip?postdata=return:');
- } else {
- #prints resource from the construction space
- $URLback='/'.$helper->{'VARS'}->{'filename'};
- if ($URLback=~/([^?]+)/) {
- $URLback=$1;
- $URLback=~s|^/~|/priv/|;
+ 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_';
}
- }
- # logic for now is too complex to trace if this has been defined
- # yet.
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- &Apache::lonnet::appenv('cgi.'.$identifier.'.file' => $filename,
- 'cgi.'.$identifier.'.layout' => $laystyle,
- 'cgi.'.$identifier.'.numcol' => $numberofcolumns,
- 'cgi.'.$identifier.'.paper' => $papersize,
- 'cgi.'.$identifier.'.selection' => $selectionmade,
- 'cgi.'.$identifier.'.tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
- 'cgi.'.$identifier.'.tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
- 'cgi.'.$identifier.'.role' => $perm{'pav'},
- 'cgi.'.$identifier.'.numberoffiles' => $#print_array,
- 'cgi.'.$identifier.'.studentnames' => $student_names,
- 'cgi.'.$identifier.'.backref' => $URLback,);
- &Apache::lonnet::appenv("cgi.$identifier.user" => $env{'user.name'},
- "cgi.$identifier.domain" => $env{'user.domain'},
- "cgi.$identifier.courseid" => $cnum,
- "cgi.$identifier.coursedom" => $cdom,
- "cgi.$identifier.resources" => $resources_printed);
-
+ }
+
+ # logic for now is too complex to trace if this has been defined
+ # yet.
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ &Apache::lonnet::appenv({'cgi.'.$identifier.'.file' => $filename,
+ 'cgi.'.$identifier.'.layout' => $laystyle,
+ 'cgi.'.$identifier.'.numcol' => $numberofcolumns,
+ 'cgi.'.$identifier.'.paper' => $papersize,
+ 'cgi.'.$identifier.'.selection' => $selectionmade,
+ 'cgi.'.$identifier.'.tableofcontents' => $helper->{'VARS'}->{'TABLE_CONTENTS'},
+ 'cgi.'.$identifier.'.tableofindex' => $helper->{'VARS'}->{'TABLE_INDEX'},
+ 'cgi.'.$identifier.'.role' => $perm{'pav'},
+ 'cgi.'.$identifier.'.numberoffiles' => $#print_array,
+ 'cgi.'.$identifier.'.studentnames' => $student_names,
+ 'cgi.'.$identifier.'.backref' => $URLback,});
+ &Apache::lonnet::appenv({"cgi.$identifier.user" => $env{'user.name'},
+ "cgi.$identifier.domain" => $env{'user.domain'},
+ "cgi.$identifier.courseid" => $cnum,
+ "cgi.$identifier.coursedom" => $cdom,
+ "cgi.$identifier.resources" => $resources_printed});
+
my $end_page = &Apache::loncommon::end_page();
- $r->print(<<FINALEND);
+ my $continue_text = &mt('Continue');
+ # If there's been an unrecoverable SSI error, report it to the user
+ if ($ssi_error) {
+ my $helpurl = &Apache::loncommon::top_nav_help('Helpdesk');
+ $r->print('<br /><p class="LC_error">'.&mt('An unrecoverable network error occurred:').'</p><p>'.
+ &mt('At least one of the resources you chose to print could not be rendered due to an unrecoverable error when communicating with a server:').
+ '<br />'.$ssi_last_error_resource.'<br />'.$ssi_last_error.
+ '</p><p>'.&mt('You can continue using the link provided below, but make sure to carefully inspect your output file! The errors will be marked in the file.').'<br />'.
+ &mt('You may be able to reprint the individual resources for which this error occurred, as the issue may be temporary.').
+ '<br />'.&mt('If the error persists, please contact the [_1] for assistance.',$helpurl).'</p><p>'.
+ &mt('We apologize for the inconvenience.').'</p>'.
+ '<a href="/cgi-bin/printout.pl?'.$identifier.'">'.$continue_text.'</a>'.$end_page);
+ } else {
+ $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>
+<a href="/cgi-bin/printout.pl?$identifier">$continue_text</a>
$end_page
FINALEND
+ } # endif ssi errors.
}
@@ -1890,9 +2781,9 @@ sub print_resources {
my $printed = '';
my ($username,$userdomain,$usersection) = split /:/,$person;
my $fullname = &get_name($username,$userdomain);
- my $namepostfix;
+ my $namepostfix = "\\\\"; # Both anon and not anon should get the same vspace.
if ($person =~ 'anon') {
- $namepostfix="\\\\Name: ";
+ $namepostfix .="Name: ";
$fullname = "CODE - ".$moreenv->{'CODE'};
}
# Fullname may have special latex characters that need \ prefixing:
@@ -1923,6 +2814,7 @@ sub print_resources {
}
}
$i++;
+
if ( !($type eq 'problems' &&
($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
@@ -1930,11 +2822,9 @@ sub print_resources {
if ($res_url!~m|^ext/|
&& $res_url=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
$printed .= $curresline.':';
-
&Apache::lonxml::remember_problem_counter();
- my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
-
+ my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'only')) {
# Use a copy of the hash so we don't pervert it on future loop passes.
@@ -1952,13 +2842,22 @@ sub print_resources {
my $header =&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
- my $body ='\vskip 0 mm \noindent\textbf{'.&Apache::lonnet::gettitle($curresline).'}\vskip 0 mm ';
- $body .=&path_to_problem($res_url,$LaTeXwidth);
+ $header =~ s/\\begin{document}//; #<<<<<
+ my $title = &Apache::lonnet::gettitle($curresline);
+ $title = &Apache::lonxml::latex_special_symbols($title);
+ my $body ='\vskip 0 mm \noindent\textbf{'.$title.'}\vskip 0 mm ';
+ $body .=&path_to_problem($res_url,$LaTeXwidth);
$body .='\vskip 1 mm '.$ansrendered;
$body = &encapsulate_minipage($body);
$rendered = $header.$body;
}
}
+ if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+ my $url = &Apache::lonnet::clutter($res_url);
+ my $annotation = &annotate($url);
+ $rendered =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
+ }
+ my $junk;
if ($remove_latex_header eq 'YES') {
$rendered = &latex_header_footer_remove($rendered);
} else {
@@ -1967,15 +2866,25 @@ sub print_resources {
$current_output .= $rendered;
} elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
$printed .= $curresline.':';
- my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
-
+ my $rendered = &get_student_view_with_retries($curresline,$ssi_retry_count,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
+ if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
+ my $url = &Apache::lonnet::clutter($res_url);
+ my $annotation = &annotate($url);
+ $annotation =~ s/(\\end{document})/$annotation$1/;
+ }
if ($remove_latex_header eq 'YES') {
$rendered = &latex_header_footer_remove($rendered);
} else {
$rendered =~ s/\\end{document}//;
}
$current_output .= $rendered.'\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\strut \vskip 0 mm \strut ';
-
+ } elsif($res_url = ~/\.pdf$/) {
+ my $url = &Apache::lonnet::clutter($res_url);
+ my $rendered = &include_pdf($url);
+ if ($remove_latex_header ne 'NO') {
+ $rendered = &latex_header_footer_remove($rendered);
+ }
+ $current_output .= $rendered;
} else {
my $rendered = &unsupported($res_url,$helper->{'VARS'}->{'LATEX_TYPE'},$curresline);
if ($remove_latex_header ne 'NO') {
@@ -1987,20 +2896,19 @@ 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');
my $header_line =
- &format_page_header($parmhash{'print_header_format'},
- $currentassignment, $courseidinfo, $fullname);
+ &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
+ $currentassignment, $courseidinfo, $fullname, $usersection);
my $header_start = ($columns_in_format == 1) ? '\lhead'
: '\fancyhead[LO]';
$header_line = $header_start.'{'.$header_line.'}';
-
if ($current_output=~/\\documentclass/) {
$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /;
} else {
@@ -2046,6 +2954,8 @@ sub handler {
if(-e $conversion_queuefile) {
unlink $conversion_queuefile;
}
+
+
&output_data($r,$helper,\%parmhash);
return OK;
}
@@ -2075,6 +2985,33 @@ sub init_perm {
}
}
+sub get_randomly_ordered_warning {
+ my ($helper,$map) = @_;
+
+ my $message;
+
+ my $postdata = $env{'form.postdata'} || $helper->{VARS}{'postdata'};
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ if (defined($navmap)) {
+ my $res = $navmap->getResourceByUrl($map);
+ if ($res) {
+ my $func =
+ sub { return ($_[0]->is_map() && $_[0]->randomorder); };
+ my @matches = $navmap->retrieveResources($res, $func,1,1,1);
+ if (@matches) {
+ $message = "Some of the items below are in folders set to be randomly ordered. However, when printing the contents of these folders, they will be printed in the original order for all students, not the randomized order.";
+ }
+ }
+ if ($message) {
+ return '<message type="warning">'.$message.'</message>';
+ }
+ } else {
+ $message = "Retrieval of information about ordering of resources failed.";
+ return '<message type="warning">'.$message.'</message>';
+ }
+ return;
+}
+
sub printHelper {
my $r = shift;
@@ -2116,6 +3053,11 @@ sub printHelper {
$helper->declareVar('FINISHPAGE');
$helper->declareVar('PRINT_TYPE');
$helper->declareVar("showallfoils");
+ $helper->declareVar("STUDENTS");
+
+
+
+
# The page breaks can get loaded initially from the course environment:
# But we only do this in the initial state so that they are allowed to change.
@@ -2127,6 +3069,8 @@ sub printHelper {
{'pagebreaks' => 'scalar',
'lastprinttype' => 'scalar'});
+ # This will persistently load in the data we want from the
+ # very first screen.
if($helper->{VARS}->{PRINT_TYPE} eq $env{'form.lastprinttype'}) {
if (!defined ($env{"form.CURRENT_STATE"})) {
@@ -2141,9 +3085,6 @@ sub printHelper {
}
-
- # 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:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
$helper->{VARS}->{'filename'} = "~$1/$2";
@@ -2151,6 +3092,9 @@ sub printHelper {
} else {
if ($env{'form.postdata'}) {
$helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});
+ if ( $helper->{VARS}->{'symb'} eq '') {
+ $helper->{VARS}->{'postdata'} = $env{'form.postdata'};
+ }
}
if ($env{'form.symb'}) {
$helper->{VARS}->{'symb'} = $env{'form.symb'};
@@ -2178,6 +3122,7 @@ sub printHelper {
my $symb = $helper->{VARS}->{'symb'};
my ($map, $id, $url);
my $subdir;
+ my $is_published=0; # True when printing from resource space.
# Get the resource name from construction space
if ($helper->{VARS}->{'construction'}) {
@@ -2186,10 +3131,17 @@ sub printHelper {
$subdir = substr($helper->{VARS}->{'filename'},
0, rindex($helper->{VARS}->{'filename'}, '/') + 1);
} else {
- ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
- $helper->{VARS}->{'postdata'} =
- &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
+ # From course space:
+ if ($symb ne '') {
+ ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
+ $helper->{VARS}->{'postdata'} =
+ &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
+ } else {
+ $url = $helper->{VARS}->{'postdata'};
+ $is_published=1; # From resource space.
+ }
+ $url = &Apache::lonnet::clutter($url);
if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
my $postdata = $helper->{VARS}->{'postdata'};
$resourceTitle = substr($postdata, rindex($postdata, '/') + 1);
@@ -2200,7 +3152,7 @@ sub printHelper {
$helper->{VARS}->{'curseed'}=$env{'form.curseed'};
}
if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
- $helper->{VARS}->{'probstatus'}=$env{'form.problemtype'};
+ $helper->{VARS}->{'probstatus'}=$env{'form.problemstatus'};
}
my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
@@ -2209,11 +3161,6 @@ sub printHelper {
# "Delete everything after the last slash."
$subdir =~ s|/[^/]+$||;
- if (not $helper->{VARS}->{'construction'}) {
- $subdir=$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$subdir;
- }
- # "Remove all duplicate slashes."
- $subdir =~ s|/+|/|g;
# What can be printed is a very dynamic decision based on
# lots of factors. So we need to dynamically build this list.
@@ -2234,9 +3181,9 @@ sub printHelper {
}
# Useful filter strings
- my $isProblem = '($res->is_problem()||$res->contains_problem) ';
+ my $isProblem = '($res->is_problem()||$res->contains_problem||$res->is_practice()) ';
$isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
- my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence()';
+ my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence() || $res->is_practice()';
my $isNotMap = '!$res->is_sequence()';
$isNotMap .= ' && !$res->randomout()' if !$userCanSeeHidden;
my $isMap = '$res->is_map()';
@@ -2254,76 +3201,167 @@ sub printHelper {
"' variable='FINISHPAGE' />";
}
- if (($helper->{'VARS'}->{'construction'} ne '1') &&
+ # If not construction space user can print the components of a page:
+
+ my $page_ispage;
+ my $page_title;
+ if (!$helper->{VARS}->{'construction'}) {
+ my $varspostdata = $helper->{VARS}->{'postdata'};
+ my $varsassignment = $helper->{VARS}->{'assignment'};
+ my $page_navmap = Apache::lonnavmaps::navmap->new();
+ if (defined($page_navmap)) {
+ my @page_resources = $page_navmap->retrieveResources($url);
+ if(defined($page_resources[0])) {
+ $page_ispage = $page_resources[0]->is_page();
+ $page_title = $page_resources[0]->title();
+ my $resourcesymb = $page_resources[0]->symb();
+ my ($pagemap, $pageid, $pageurl) = &Apache::lonnet::decode_symb($symb);
+ if ($page_ispage) {
+ push @{$printChoices},
+ [&mt('Selected [_1]Problems[_2] from page [_3]', '<b>', '</b>', '<b><i>'.$page_title.'</i></b>'),
+ 'map_problems_in_page',
+ 'CHOOSE_PROBLEMS_PAGE'];
+ push @{$printChoices},
+ [&mt('Selected [_1]Resources[_2] from page [_3]', '<b>', '</b>', '<b><i>'.$page_title.'</i></b>'),
+ 'map_resources_in_page',
+ 'CHOOSE_RESOURCES_PAGE'];
+ }
+ my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS_PAGE',
+ 'Select Problem(s) to print',
+ "multichoice='1' toponly='1' addstatus='1' closeallpages='1'",
+ 'RESOURCES',
+ 'PAGESIZE',
+ $url,
+ $isProblem, '', $symbFilter,
+ $start_new_option);
+
+
+ $helperFragment .= &generate_resource_chooser('CHOOSE_RESOURCES_PAGE',
+ 'Select Resource(s) to print',
+ 'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
+ 'RESOURCES',
+ 'PAGESIZE',
+ $url,
+ $isNotMap, '', $symbFilter,
+ $start_new_option);
+
+
+
+
+
+ &Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
+
+ }
+ }
+ }
+ if (($helper->{'VAR'}->{'construction'} ne '1' ) &&
$helper->{VARS}->{'postdata'} &&
$helper->{VARS}->{'assignment'}) {
# Allow problems from sequence
- push @{$printChoices}, [&mt('Selected <b>Problems</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems', 'CHOOSE_PROBLEMS'];
+ push @{$printChoices},
+ [&mt('Selected [_1]Problems[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'),
+ 'map_problems',
+ 'CHOOSE_PROBLEMS'];
# Allow all resources from sequence
- push @{$printChoices}, [&mt('Selected <b>Resources</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
-
- my $helperFragment = <<HELPERFRAGMENT;
- <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
- <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
- closeallpages="1">
- <nextstate>PAGESIZE</nextstate>
- <filterfunc>return $isProblem;</filterfunc>
- <mapurl>$map</mapurl>
- <valuefunc>return $symbFilter;</valuefunc>
- $start_new_option
- </resource>
- </state>
-
- <state name="CHOOSE_PROBLEMS_HTML" title="Select Resource(s) to print">
- <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
- closeallpages="1">
- <nextstate>PAGESIZE</nextstate>
- <filterfunc>return $isNotMap;</filterfunc>
- <mapurl>$map</mapurl>
- <valuefunc>return $symbFilter;</valuefunc>
- $start_new_option
- </resource>
- </state>
-HELPERFRAGMENT
+ push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'),
+ 'map_problems_pages',
+ 'CHOOSE_PROBLEMS_HTML'];
+ my $helperFragment = &generate_resource_chooser('CHOOSE_PROBLEMS',
+ 'Select Problem(s) to print',
+ 'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
+ 'RESOURCES',
+ 'PAGESIZE',
+ $map,
+ $isProblem, '',
+ $symbFilter,
+ $start_new_option);
+ $helperFragment .= &generate_resource_chooser('CHOOSE_PROBLEMS_HTML',
+ 'Select Resource(s) to print',
+ 'multichoice="1" toponly="1" addstatus="1" closeallpages="1"',
+ 'RESOURCES',
+ 'PAGESIZE',
+ $map,
+ $isNotMap, '',
+ $symbFilter,
+ $start_new_option);
&Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
}
- # If the user has pfo (print for otheres) allow them to print all
- # problems and resources in the entier course, optionally for selected students
- if ($perm{'pfo'} &&
- ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {
-
- push @{$printChoices}, ['Selected <b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
- push @{$printChoices}, ['Selected <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">
- <resource variable="RESOURCES" toponly='0' multichoice="1"
- suppressEmptySequences='0' addstatus="1" closeallpages="1">
- <nextstate>PAGESIZE</nextstate>
- <filterfunc>return $isProblemOrMap;</filterfunc>
- <choicefunc>return $isNotMap;</choicefunc>
- <valuefunc>return $symbFilter;</valuefunc>
- $start_new_option
- </resource>
- </state>
- <state name="ALL_RESOURCES" title="Select Resource(s) to print">
- <resource variable="RESOURCES" toponly='0' multichoice='1'
- suppressEmptySequences='0' addstatus='1' closeallpages='1'>
- <nextstate>PAGESIZE</nextstate>
- <filterfunc>return $isNotMap; </filterfunc>
- <valuefunc>return $symbFilter;</valuefunc>
- $start_new_option
- </resource>
+ # If the user has pfo (print for others) allow them to print all
+ # problems and resources in the entire course, optionally for selected students
+ my $post_data = $helper->{VARS}->{'postdata'};
+ if ($perm{'pfo'} && !$is_published &&
+ ($post_data=~/\/res\// || $post_data =~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {
+
+ push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];
+ push @{$printChoices}, [&mtn('Selected <b>Resources</b> from <b>entire course</b>'), 'all_resources', 'ALL_RESOURCES'];
+ push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b> for <b>selected people</b>'), 'all_problems_students', 'ALL_PROBLEMS_STUDENTS'];
+my $suffixXml = <<ALL_PROBLEMS;
+ <state name="STUDENTS1" title="Select People">
+ <message><b>Select sorting order of printout</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>
+ <message><br /><hr /><br /> </message>
+ <student multichoice='1' variable="STUDENTS" nextstate="PRINT_FORMATTING" coursepersonnel="1"/>
</state>
ALL_PROBLEMS
+ &Apache::lonxml::xmlparse($r, 'helper',
+ &generate_resource_chooser('ALL_PROBLEMS',
+ 'SelectProblem(s) to print',
+ 'multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
+ 'RESOURCES',
+ 'PAGESIZE',
+ '',
+ $isProblemOrMap, $isNotMap,
+ $symbFilter,
+ $start_new_option) .
+ &generate_resource_chooser('ALL_RESOURCES',
+ 'Select Resource(s) to print',
+ " toponly='0' multichoice='1' suppressEmptySequences='0' addstatus='1' closeallpages='1'",
+ 'RESOURCES',
+ 'PAGESIZE',
+ '',
+ $isNotMap,'',$symbFilter,
+ $start_new_option) .
+ &generate_resource_chooser('ALL_PROBLEMS_STUDENTS',
+ 'Select Problem(s) to print',
+ 'toponly="0" multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
+ 'RESOURCES',
+ 'STUDENTS1',
+ '',
+ $isProblemOrMap,'' , $symbFilter,
+ $start_new_option) .
+ $suffixXml
+ );
if ($helper->{VARS}->{'assignment'}) {
- push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>selected students</b>",$sequenceTitle), 'problems_for_students', 'CHOOSE_STUDENTS'];
- push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];
+
+ # If we were looking at a page, allow a selection of problems from the page
+ # either for selected students or for coded assignments.
+
+ if ($page_ispage) {
+ push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from page [_3] for [_4]selected people[_5]',
+ '<b>', '</b>', '<b><i>'.$page_title.'</i></b>', '<b>', '</b>'),
+ 'problems_for_students_from_page', 'CHOOSE_TGT_STUDENTS_PAGE'];
+ push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from page [_3] for [_4]CODEd assignments[_5]',
+ '<b>', '</b>', '<b><i>'.$page_title.'</i></b>', '<b>', '</b>'),
+ 'problems_for_anon_page', 'CHOOSE_ANON1_PAGE'];
+ }
+ push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]selected people[_5]',
+ '<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'),
+ 'problems_for_students', 'CHOOSE_STUDENTS'];
+ push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]CODEd assignments[_5]',
+ '<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'),
+ 'problems_for_anon', 'CHOOSE_ANON1'];
}
+ my $randomly_ordered_warning =
+ &get_randomly_ordered_warning($helper,$map);
+
# resource_selector will hold a few states that:
# - Allow resources to be selected for printing.
# - Determine pagination between assignments.
@@ -2333,18 +3371,15 @@ ALL_PROBLEMS
# with one state, and use REGEXPs at inclusion time to set state names
# and next states for better mix and match capability
#
- my $resource_selector=<<RESOURCE_SELECTOR;
- <state name="SELECT_PROBLEMS" title="Select resources to print">
- <nextstate>PRINT_FORMATTING</nextstate>
- <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
- <resource variable="RESOURCES" multichoice="1" addstatus="1"
- closeallpages="1">
- <filterfunc>return $isProblem;</filterfunc>
- <mapurl>$map</mapurl>
- <valuefunc>return $symbFilter;</valuefunc>
- $start_new_option
- </resource>
- </state>
+ my $resource_selector= &generate_resource_chooser('SELECT_PROBLEMS',
+ 'Select resources to print',
+ 'multichoice="1" addstatus="1" closeallpages="1"',
+ 'RESOURCES',
+ 'PRINT_FORMATTING',
+ '',
+ $isProblem, '', $symbFilter,
+ $start_new_option);
+ $resource_selector .= <<RESOURCE_SELECTOR;
<state name="PRINT_FORMATTING" title="How should results be printed?">
<message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
<choices variable="EMPTY_PAGES">
@@ -2364,19 +3399,31 @@ ALL_PROBLEMS
</choices>
</state>
RESOURCE_SELECTOR
+ $resource_selector .= &generate_resource_chooser('CHOOSE_STUDENTS_PAGE',
+ 'Select Problem(s) to print',
+ "multichoice='1' addstatus='1' closeallpages ='1'",
+ 'RESOURCES',
+ 'PRINT_FORMATTING',
+ $url,
+ $isProblem, '', $symbFilter,
+ $start_new_option);
+
+
+# Generate student choosers.
+
- &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
- <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
- <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>
- <message><br /><hr /><br /> </message>
- <student multichoice='1' variable="STUDENTS" nextstate="SELECT_PROBLEMS" coursepersonnel="1"/>
- </state>
- $resource_selector
-CHOOSE_STUDENTS
+
+ &Apache::lonxml::xmlparse($r, 'helper',
+ &generate_student_chooser('CHOOSE_TGT_STUDENTS_PAGE',
+ 'student_sort',
+ 'STUDENTS',
+ 'CHOOSE_STUDENTS_PAGE'));
+ &Apache::lonxml::xmlparse($r, 'helper',
+ &generate_student_chooser('CHOOSE_STUDENTS',
+ 'student_sort',
+ 'STUDENTS',
+ 'SELECT_PROBLEMS'));
+ &Apache::lonxml::xmlparse($r, 'helper', $resource_selector);
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -2421,10 +3468,9 @@ CHOOSE_STUDENTS
}
-
- open(FH,$Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+ my @lines = &Apache::grades::get_scantronformat_file();
my $codechoice='';
- foreach my $line (<FH>) {
+ foreach my $line (@lines) {
my ($name,$description,$code_type,$code_length)=
(split(/:/,$line))[0,1,2,4];
if ($code_length > 0 &&
@@ -2435,73 +3481,42 @@ CHOOSE_STUDENTS
if ($codechoice eq '') {
$codechoice='<choice computer="default">Default</choice>';
}
- &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_ANON1);
- <state name="CHOOSE_ANON1" title="Specify CODEd Assignments">
- <nextstate>SELECT_PROBLEMS</nextstate>
- <message><h4>Fill out one of the forms below</h4></message>
- <message><br /><hr /> <br /></message>
- <message><h3>Generate new CODEd Assignments</h3></message>
- <message><table><tr><td><b>Number of CODEd 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'} &&
- !\$helper->{'VARS'}{'SINGLE_CODE'} &&
- !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
- 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><tr><td></message>
- <message><b>Bubble sheet type:</b></message>
- <message></td><td></message>
- <dropdown variable="CODE_OPTION" multichoice="0" allowempty="0">
- $codechoice
- </dropdown>
- <message></td></tr><tr><td colspan="2"></td></tr><tr><td></message>
- <message></td></tr><tr><td></table></message>
- <message><br /><hr /><h3>Print a Specific CODE </h3><br /><table></message>
- <message><tr><td><b>Enter a CODE to print:</b></td><td></message>
- <string variable="SINGLE_CODE" size="10">
- <validator>
- if(!\$helper->{'VARS'}{'NUMBER_TO_PRINT_TOTAL'} &&
- !\$helper->{'VARS'}{'REUSE_OLD_CODES'} &&
- !\$helper->{'VARS'}{'CODE_SELECTED_FROM_LIST'}) {
- return &Apache::lonprintout::is_code_valid(\$helper->{'VARS'}{'SINGLE_CODE'},
- \$helper->{'VARS'}{'CODE_OPTION'});
- } else {
- return undef; # Other forces control us.
- }
- </validator>
- </string>
- <message></td></tr><tr><td></message>
- $code_selection
- <message></td></tr></table></message>
- <message><hr /><h3>Reprint a Set of Saved CODEs</h3><table><tr><td></message>
- <message><b>Select saved CODEs:</b></message>
- <message></td><td></message>
- <dropdown variable="REUSE_OLD_CODES">
- $namechoice
- </dropdown>
- <message></td></tr></table></message>
- </state>
- $resource_selector
-CHOOSE_ANON1
+ my $anon1 = &generate_code_selector($helper,
+ 'CHOOSE_ANON1',
+ 'SELECT_PROBLEMS',
+ $codechoice,
+ $code_selection,
+ $namechoice) . $resource_selector;
+
+
+ &Apache::lonxml::xmlparse($r, 'helper',$anon1);
+
+ my $anon_page = &generate_code_selector($helper,
+ 'CHOOSE_ANON1_PAGE',
+ 'SELECT_PROBLEMS_PAGE',
+ $codechoice,
+ $code_selection,
+ $namechoice) .
+ &generate_resource_chooser('SELECT_PROBLEMS_PAGE',
+ 'Select Problem(s) to print',
+ "multichoice='1' addstatus='1' closeallpages ='1'",
+ 'RESOURCES',
+ 'PRINT_FORMATTING',
+ $url,
+ $isProblem, '', $symbFilter,
+ $start_new_option);
+ &Apache::lonxml::xmlparse($r, 'helper', $anon_page);
if ($helper->{VARS}->{'assignment'}) {
- push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>selected students</b>",$sequenceTitle), 'resources_for_students', 'CHOOSE_STUDENTS1'];
- push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'resources_for_anon', 'CHOOSE_ANON2'];
+ push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]selected people[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_students', 'CHOOSE_STUDENTS1'];
+ push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]CODEd assignments[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_anon', 'CHOOSE_ANON2'];
}
$resource_selector=<<RESOURCE_SELECTOR;
<state name="SELECT_RESOURCES" title="Select Resources">
+ $randomly_ordered_warning
<nextstate>PRINT_FORMATTING</nextstate>
<message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
<resource variable="RESOURCES" multichoice="1" addstatus="1"
@@ -2512,6 +3527,7 @@ CHOOSE_ANON1
$start_new_option
</resource>
</state>
+
<state name="PRINT_FORMATTING" title="Format of the print job">
<nextstate>NUMBER_PER_PDF</nextstate>
<message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
@@ -2565,7 +3581,7 @@ CHOOSE_STUDENTS1
</validator>
</string>
<message></td></tr><tr><td></message>
- <message><b>Names to store the CODEs under for later:</b></message>
+ <message><b>Names to save the CODEs under for later:</b></message>
<message></td><td></message>
<string variable="ANON_CODE_STORAGE_NAME" maxlength="50" size="20" />
<message></td></tr><tr><td></message>
@@ -2605,12 +3621,20 @@ 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 $perm{'pav'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') {
- push @{$printChoices}, [&mt("Selected <b>Problems</b> from current subdirectory <b><i>[_1]</i></b>",$subdir), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
-
- my $f = '$filename';
+ if (($perm{'pav'}
+ && $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'
+ && (defined($helper->{'VARS'}->{'construction'})
+ ||
+ (&Apache::lonnet::allowed('bre',$subdir) eq 'F'
+ &&
+ $helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)
+ ))
+ && $helper->{VARS}->{'assignment'} eq ""
+ ) {
+ my $pretty_dir = &Apache::lonnet::hreflocation($subdir);
+ push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from current subdirectory [_3]','<b>','</b>','<b><i>'.$pretty_dir.'</i></b>','<b>','</b>'), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
- <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$subdir</small></b> to print">
+ <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$pretty_dir</small></b> to print">
<files variable="FILES" multichoice='1'>
<nextstate>PAGESIZE</nextstate>
@@ -2631,8 +3655,8 @@ CHOOSE_FROM_SUBDIR
# Allow the user to select any sequence in the course, feed it to
# another resource selector for that sequence
- if (!$helper->{VARS}->{'construction'}) {
- push @$printChoices, ["Selected <b>Resources</b> from <b>selected folder</b> in course",
+ if (!$helper->{VARS}->{'construction'} && !$is_published) {
+ push @$printChoices, [&mtn("Selected <b>Resources</b> from <b>selected folder</b> in course"),
'select_sequences', 'CHOOSE_SEQUENCE'];
my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
#Escape apostrophes and backslashes for Perl
@@ -2678,7 +3702,15 @@ CHOOSE_FROM_ANY_SEQUENCE
if (($perm{'pav'} 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>");
+ &addMessage('<br />'
+ .'<h3>'.&mt('Print Options').'</h3>'
+ .&Apache::lonhtmlcommon::start_pick_box()
+ .&Apache::lonhtmlcommon::row_title(
+ '<label for="ANSWER_TYPE_forminput">'
+ .&mt('Print Answers')
+ .'</label>'
+ )
+ );
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'ANSWER_TYPE';
$helper->declareVar('ANSWER_TYPE');
@@ -2688,16 +3720,52 @@ CHOOSE_FROM_ANY_SEQUENCE
['Only Answers', 'only']
];
Apache::lonhelper::dropdown->new();
- addMessage("</td></tr>");
+ &addMessage(&Apache::lonhtmlcommon::row_closure());
$startedTable = 1;
+
+#
+# Select font size.
+#
+
+ $helper->declareVar('fontsize');
+ &addMessage(&Apache::lonhtmlcommon::row_title(&mt('Font Size')));
+ my $xmlfrag = << "FONT_SELECTION";
+
+
+ <dropdown variable='fontsize' multichoice='0', allowempty='0'>
+ <defaultvalue>
+ return 'normalsize';
+ </defaultvalue>
+ <choice computer='tiny'>Tiny</choice>
+ <choice computer='sub/superscriptsize'>Script Size</choice>
+ <choice computer='footnotesize'>Footnote Size</choice>
+ <choice computer='small'>Small</choice>
+ <choice computer='normalsize'>Normal (default)</choice>
+ <choice computer='large'>larger than normal</choice>
+ <choice computer='Large'>Even larger than normal</choice>
+ <choice computer='LARGE'>Still larger than normal</choice>
+ <choice computer='huge'>huge font size</choice>
+ <choice computer='Huge'>Largest possible size</choice>
+ </dropdown>
+FONT_SELECTION
+ &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
+ &addMessage(&Apache::lonhtmlcommon::row_closure(1));
}
if ($perm{'pav'}) {
if (!$startedTable) {
- addMessage("<hr width='33%' /><table><tr><td align='right'>LaTeX mode: </td><td>");
+ addMessage("<hr width='33%' /><table><tr><td align='right'>".
+ '<label for="LATEX_TYPE_forminput">'.
+ &mt('LaTeX mode').
+ "</label>: </td><td>");
$startedTable = 1;
} else {
- addMessage("<tr><td align='right'>LaTeX mode: </td><td>");
+ &addMessage(&Apache::lonhtmlcommon::row_title(
+ '<label for="LATEX_TYPE_forminput">'
+ .&mt('LaTeX mode')
+ .'</label>'
+ )
+ );
}
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'LATEX_TYPE';
@@ -2713,7 +3781,13 @@ CHOOSE_FROM_ANY_SEQUENCE
}
Apache::lonhelper::dropdown->new();
- addMessage("</td></tr><tr><td align='right'>Print Table of Contents: </td><td>");
+ &addMessage(&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title(
+ '<label for="TABLE_CONTENTS_forminput">'
+ .&mt('Print Table of Contents')
+ .'</label>'
+ )
+ );
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'TABLE_CONTENTS';
$helper->declareVar('TABLE_CONTENTS');
@@ -2721,10 +3795,15 @@ CHOOSE_FROM_ANY_SEQUENCE
['No', 'no'],
['Yes', 'yes'] ];
Apache::lonhelper::dropdown->new();
- addMessage("</td></tr>");
+ &addMessage(&Apache::lonhtmlcommon::row_closure());
if (not $helper->{VARS}->{'construction'}) {
- addMessage("<tr><td align='right'>Print Index: </td><td>");
+ &addMessage(&Apache::lonhtmlcommon::row_title(
+ '<label for="TABLE_INDEX_forminput">'
+ .&mt('Print Index')
+ .'</label>'
+ )
+ );
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'TABLE_INDEX';
$helper->declareVar('TABLE_INDEX');
@@ -2732,8 +3811,13 @@ CHOOSE_FROM_ANY_SEQUENCE
['No', 'no'],
['Yes', 'yes'] ];
Apache::lonhelper::dropdown->new();
- addMessage("</td></tr>");
- addMessage("<tr><td align='right'>Print Discussions: </td><td>");
+ &addMessage(&Apache::lonhtmlcommon::row_closure());
+ &addMessage(&Apache::lonhtmlcommon::row_title(
+ '<label for="PRINT_DISCUSSIONS_forminput">'
+ .&mt('Print Discussions')
+ .'</label>'
+ )
+ );
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'variable'} = 'PRINT_DISCUSSIONS';
$helper->declareVar('PRINT_DISCUSSIONS');
@@ -2741,45 +3825,108 @@ CHOOSE_FROM_ANY_SEQUENCE
['No', 'no'],
['Yes', 'yes'] ];
Apache::lonhelper::dropdown->new();
- addMessage("</td></tr>");
+ &addMessage(&Apache::lonhtmlcommon::row_closure());
+
+ # Prompt for printing annotations too.
+
+ &addMessage(&Apache::lonhtmlcommon::row_title(
+ '<label for="PRINT_ANNOTATIONS_forminput">'
+ .&mt('Print Annotations')
+ .'</label>'
+ )
+ );
+ $paramHash = Apache::lonhelper::getParamHash();
+ $paramHash->{'variable'} = "PRINT_ANNOTATIONS";
+ $helper->declareVar("PRINT_ANNOTATIONS");
+ $paramHash->{CHOICES} = [
+ ['No', 'no'],
+ ['Yes', 'yes']];
+ Apache::lonhelper::dropdown->new();
+ &addMessage(&Apache::lonhtmlcommon::row_closure());
- addMessage("<tr><td align = 'right'> </td><td>");
+ &addMessage(&Apache::lonhtmlcommon::row_title(&mt('Foils')));
$paramHash = Apache::lonhelper::getParamHash();
$paramHash->{'multichoice'} = "true";
$paramHash->{'allowempty'} = "true";
$paramHash->{'variable'} = "showallfoils";
- $paramHash->{'CHOICES'} = [ ["Show all foils", "1"] ];
+ $paramHash->{'CHOICES'} = [ [&mt('Show All Foils'), "1"] ];
Apache::lonhelper::choices->new();
- addMessage("</td></tr>");
+ &addMessage(&Apache::lonhtmlcommon::row_closure(1));
}
if ($helper->{'VARS'}->{'construction'}) {
- 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">
- <defaultvalue>
- return $helper->{VARS}->{'curseed'};
- </defaultvalue>
- </string>
- <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_value','sty')">Select style file</a> </td><tr><td></message>
+ my $stylevalue='$Apache::lonnet::env{"construct.style"}';
+ my $randseedtext=&mt("Use random seed");
+ my $stylefiletext=&mt("Use style file");
+ my $selectfiletext=&mt("Select style file");
+
+ my $xmlfrag .= '<message>'
+ .&Apache::lonhtmlcommon::row_title('<label for="curseed_forminput">'
+ .$randseedtext
+ .'</label>'
+ )
+ .'</message>
+ <string variable="curseed" size="15" maxlength="15">
+ <defaultvalue>
+ return '.$helper->{VARS}->{'curseed'}.';
+ </defaultvalue>'
+ .'</string>'
+ .'<message>'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title('<label for="style_file">'
+ .$stylefiletext
+ .'</label>'
+ )
+ .'</message>
+ <string variable="style_file" size="40">
+ <defaultvalue>
+ return '.$stylevalue.';
+ </defaultvalue>
+ </string><message> '
+.qq|<a href="javascript:openbrowser('helpform','style_file_forminput','sty')">|
+.$selectfiletext.'</a>'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title(&mt('Show All Foils'))
+ .'</message>
<choices allowempty="1" multichoice="true" variable="showallfoils">
- <choice computer="1">Show all foils?</choice>
- </choices>
- <message></td></tr></message>
-RNDSEED
+ <choice computer="1"> </choice>
+ </choices>'
+ .'<message>'
+ .&Apache::lonhtmlcommon::row_closure()
+ .'</message>';
&Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
- $helper->{'VARS'}->{'style_file'}=$env{'form.style_file_value'};
-
- }
+
+
+ &addMessage(&Apache::lonhtmlcommon::row_title(&mt('Problem Type')));
+ #
+ # Initial value from construction space:
+ #
+ if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
+ $helper->{VARS}->{'probstatus'} = $env{'form.problemtype'}; # initial value
+ }
+ $xmlfrag = << "PROBTYPE";
+ <dropdown variable="probstatus" multichoice="0" allowempty="0">
+ <defaultvalue>
+ return "$helper->{VARS}->{'probstatus'}";
+ </defaultvalue>
+ <choice computer="problem">Homework Problem</choice>
+ <choice computer="exam">Exam Problem</choice>
+ <choice computer="survey">Survey question</choice>
+ </dropdown>
+PROBTYPE
+ &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
+ &addMessage(&Apache::lonhtmlcommon::row_closure(1));
+
+
+
+ }
}
if ($startedTable) {
- addMessage("</table>");
+ &addMessage(&Apache::lonhtmlcommon::end_pick_box());
}
Apache::lonprintout::page_format_state->new("FORMAT");
@@ -2876,30 +4023,36 @@ sub render {
my $PageLayout=&mt('Page layout');
my $NumberOfColumns=&mt('Number of columns');
my $PaperType=&mt('Paper type');
- $result .= <<STATEHTML;
+ my $landscape=&mt('Landscape');
+ my $portrait=&mt('Portrait');
+ my $pdfFormLabel=&mt('PDF-Formfields');
+ my $with=&mt('with Formfields');
+ my $without=&mt('without Formfields');
+
-<hr width="33%" />
-<table cellpadding="3">
- <tr>
- <td align="center"><b>$PageLayout</b></td>
- <td align="center"><b>$NumberOfColumns</b></td>
- <td align="center"><b>$PaperType</b></td>
- </tr>
- <tr>
- <td>
- <label><input type="radio" name="${var}.layout" value="L" /> Landscape </label><br />
- <label><input type="radio" name="${var}.layout" value="P" checked='1' /> Portrait </label>
- </td>
- <td align="center">
- <select name="${var}.cols">
-STATEHTML
+ $result.='<h3>'.&mt('Layout Options').'</h3>'
+ .&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .'<th>'.$PageLayout.'</th>'
+ .'<th>'.$NumberOfColumns.'</th>'
+ .'<th>'.$PaperType.'</th>'
+ .'<th>'.$pdfFormLabel.'</th>'
+ .&Apache::loncommon::end_data_table_header_row()
+ .&Apache::loncommon::start_data_table_row()
+ .'<td>'
+ .'<label><input type="radio" name="'.${var}.'.layout" value="L" />'.$landscape.'</label><br />'
+ .'<label><input type="radio" name="'.${var}.'.layout" value="P" checked="checked" />'.$portrait.'</label>'
+ .'</td>';
+
+ $result.='<td align="center">'
+ .'<select name="'.${var}.'.cols">';
my $i;
for ($i = 1; $i <= $maxColumns; $i++) {
if ($i == 2) {
- $result .= "<option value='$i' selected>$i</option>\n";
+ $result .= '<option value="'.$i.'" selected="selected">'.$i.'</option>'."\n";
} else {
- $result .= "<option value='$i'>$i</option>\n";
+ $result .= '<option value="'.$i.'">'.$i.'</option>'."\n";
}
}
@@ -2915,13 +4068,25 @@ STATEHTML
$_=~/(\w+)/;
my $papersize=$1;
if ($paperSize[$i]=~/$DefaultPaperSize/) {
- $result .= "<option selected value='$papersize'>" . $paperSize[$i] . "</option>\n";
+ $result .= '<option selected="selected" value="'.$papersize.'">'.$paperSize[$i].'</option>'."\n";
} else {
- $result .= "<option value='$papersize'>" . $paperSize[$i] . "</option>\n";
+ $result .= '<option value="'.$papersize.'">'.$paperSize[$i].'</option>'."\n";
}
$i++;
}
- $result .= "</select></td></tr></table>";
+ $result .= <<HTML;
+ </select>
+ </td>
+ <td align='center'>
+ <select name='${var}.pdfFormFields'>
+ <option selected="selected" value="no">$without</option>
+ <option value="yes">$with</option>
+ </select>
+ </td>
+HTML
+ $result.=&Apache::loncommon::end_data_table_row()
+ .&Apache::loncommon::end_data_table();
+
return $result;
}
@@ -2932,7 +4097,7 @@ sub postprocess {
my $helper = Apache::lonhelper->getHelper();
$helper->{VARS}->{$var} =
$env{"form.$var.layout"} . '|' . $env{"form.$var.cols"} . '|' .
- $env{"form.$var.paper"};
+ $env{"form.$var.paper"} . '|' . $env{"form.$var.pdfFormFields"};
return 1;
}
@@ -3010,12 +4175,8 @@ sub render {
my ($laystyle, $cols, $papersize) = split(/\|/, $format);
($papersize) = split(/ /, $papersize);
+ $laystyle = &Apache::lonprintout::map_laystyle($laystyle);
- if ($laystyle eq 'L') {
- $laystyle = 'album';
- } else {
- $laystyle = 'book';
- }
my %size;
@@ -3044,46 +4205,36 @@ sub render {
} else {
$size{'margin'} += 2.54;
}
- $result .= <<ELEMENTHTML;
-
-
-
-<p>How should each column be formatted?</p>
-
-<table cellpadding='3'>
- <tr>
- <td align='right'><b>Width</b>:</td>
- <td align='left'><input type='text' name='$var.width' value="$size{'width'}" size='4' /></td>
- <td align='left'>
- <select name='$var.widthunit'>
- $size{'width_options'}
- </select>
- </td>
- </tr>
- <tr>
- <td align='right'><b>Height</b>:</td>
- <td align='left'><input type='text' name="$var.height" value="$size{'height'}" size='4' /></td>
- <td align='left'>
- <select name='$var.heightunit'>
- $size{'height_options'}
- </select>
- </td>
- </tr>
- <tr>
- <td align='right'><b>Left margin</b>:</td>
- <td align='left'><input type='text' name='$var.lmargin' value="$size{'margin'}" size='4' /></td>
- <td align='left'>
- <select name='$var.lmarginunit'>
- $size{'margin_options'}
- </select>
- </td>
- </tr>
-</table>
-
-<!--<p>Hint: Some instructors like to leave scratch space for the student by
-making the width much smaller than the width of the page.</p>-->
-
-ELEMENTHTML
+ my %lt = &Apache::lonlocal::texthash(
+ 'format' => 'How should each column be formatted?',
+ 'width' => 'Width',
+ 'height' => 'Height',
+ 'margin' => 'Left Margin'
+ );
+
+ $result .= '<p>'.$lt{'format'}.'</p>'
+ .&Apache::lonhtmlcommon::start_pick_box()
+ .&Apache::lonhtmlcommon::row_title($lt{'width'})
+ .'<input type="text" name="'.$var.'.width" value="'.$size{'width'}.'" size="4" />'
+ .'<select name="'.$var.'.widthunit">'
+ .$size{'width_options'}
+ .'</select>'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title($lt{'height'})
+ .'<input type="text" name="'.$var.'.height" value="'.$size{'height'}.'" size="4" />'
+ .'<select name="'.$var.'.heightunit">'
+ .$size{'height_options'}
+ .'</select>'
+ .&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title($lt{'margin'})
+ .'<input type="text" name="'.$var.'.lmargin" value="'.$size{'margin'}.'" size="4" />'
+ .'<select name="'.$var.'.lmarginunit">'
+ .$size{'margin_options'}
+ .'</select>'
+ .&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::end_pick_box();
+ # <p>Hint: Some instructors like to leave scratch space for the student by
+ # making the width much smaller than the width of the page.</p>
return $result;
}
@@ -3106,11 +4257,8 @@ sub preprocess {
($papersize) = split(/ /, $papersize);
- if ($laystyle eq 'L') {
- $laystyle = 'album';
- } else {
- $laystyle = 'book';
- }
+ $laystyle = &Apache::lonprintout::map_laystyle($laystyle);
+
# Figure out some good defaults for the print out and set them:
my %size;