--- loncom/interface/lonprintout.pm 2003/05/15 19:11:26 1.177
+++ loncom/interface/lonprintout.pm 2003/05/28 21:25:33 1.187
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.177 2003/05/15 19:11:26 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.187 2003/05/28 21:25:33 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -469,7 +469,7 @@ sub latex_corrections {
my ($number_of_columns,$result) = @_;
- $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
+# $result =~ s/\\includegraphics{/\\includegraphics\[width=\\minipagewidth\]{/g;
$result =~ s/\$number_of_columns/$number_of_columns/g;
$result =~ s/(\\end{document})/\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill}\\newline\\noindent\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License $1/;
$result =~ s/(\\end{longtable}\s*)(\\strut\\newline\\noindent\\makebox\[\\textwidth\/$number_of_columns\]\[b\]{\\hrulefill})/$2$1/g;
@@ -500,14 +500,16 @@ sub latex_corrections {
sub output_data {
- my ($r,$helper) = @_;
+ my ($r,$helper,$rparmhash) = @_;
+ my %parmhash = %$rparmhash;
+ my $bodytag=&Apache::loncommon::bodytag('Preparing Printout');
$r->print(<<ENDPART);
<html>
<head>
<title>LON-CAPA output for printing</title>
</head>
-<body bgcolor="FFFFFF">
-<hr>
+$bodytag
+Please stand by while processing your print request, this may take some time ...
ENDPART
my $format_from_helper = $helper->{'VARS'}->{'FORMAT'};
@@ -536,10 +538,10 @@ ENDPART
#-- single document - problem, page, html, xml, ...
my $currentURL;
if ($helper->{'VARS'}->{'construction'} ne '1') {
- #prins published resource
+ #prints published resource
$currentURL=$helper->{'VARS'}->{'postdata'};
} else {
- #prins resource from the construction space
+ #prints resource from the construction space
$currentURL=$helper->{'VARS'}->{'filename'};
$currentURL=~s/\/home\//\/~/;
$currentURL=~s/public_html\///;
@@ -599,6 +601,7 @@ ENDPART
$form{'grade_target'}='tex';
$form{'textwidth'}=$LaTeXwidth;
$form{'symb'}=$master_seq[$i];
+ $form{'problem_split'}=$parmhash{'problem_stream_switch'};
#&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
my $texversion=&Apache::lonnet::ssi($urlp,%form);
if ($urlp=~/\.page$/) {
@@ -667,11 +670,11 @@ ENDPART
}
my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
if ($current_output=~/\\documentclass/) {
- $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm}\\usepackage{fancyhdr}\\pagestyle{fancy}\\rhead{}\\chead{} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$assignment}}\\vskip 3 mm /;
+ $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\lhead{\\textit{\\textbf{$fullname}} - $courseidinfo \\hfill \\thepage \\\\ \\textit{$helper->{VARS}->{'assignment'}}}\\vskip 3 mm /;
} else {
my $blanspages = '';
for (my $j=0;$j<$helper->{'VARS'}->{'EMPTY_PAGES'};$j++) {$blanspages.='\clearpage\strut\clearpage';}
- $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage \\vskip 3mm'.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$assignment.'}}\hskip 1.4in } \vskip 5 mm '.$current_output;
+ $current_output = '\strut\\newline\\noindent\\makebox[\\textwidth/$number_of_columns][b]{\\hrulefill}\\newline\\noindent{\\tiny Printed from LON-CAPA\\copyright MSU{\\hfill} Licensed under GNU General Public License }\\newpage '.$blanspages.'\setcounter{page}{1}\noindent\parbox{\minipagewidth}{\noindent\\lhead{\\textit{\\textbf{'.$fullname.'}} - '.$courseidinfo.' \\hfill \\thepage \\\\ \\textit{'.$helper->{VARS}->{'assignment'}.'}}} \vskip -5 mm '.$current_output;
}
$result .= $current_output;
&Apache::lonnet::delenv('form.counter');
@@ -744,9 +747,6 @@ ENDPART
}
#-------------------------------------------------------- corrections for the different page formats
$result = &page_format_transformation($papersize,$laystyle,$numberofcolumns,$helper->{'VARS'}->{'PRINT_TYPE'},$result,$helper->{VARS}->{'assignment'});
-# if ($layout eq 'CBI') {
-# $laystyle = 'album';
-# }
$result = &latex_corrections($number_of_columns,$result);
# #changes page's parameters for the one column output
# if ($ENV{'form.numberofcolumns'} == 1) {
@@ -797,8 +797,17 @@ sub handler {
# $r->print(' '.$key.'->'.$helper->{'VARS'}->{$key}.'<-<br />');
# }
# return OK;
-
- &output_data($r,$helper);
+
+ my %parmhash=&Apache::lonnet::coursedescription($ENV{'request.course.id'});
+# $r->print('<br /> START '.$ENV{'request.course.fn'}.' FINISH <br />');
+# my $key;
+# foreach $key (keys %parmhash) {
+# $r->print(' '.$key.'->'.$parmhash{$key}.'<-<br />');
+# }
+# return OK;
+
+
+ &output_data($r,$helper,\%parmhash);
return OK;
}
@@ -842,6 +851,7 @@ sub printHelper {
$helper->declareVar('postdata');
$helper->declareVar('filename');
$helper->declareVar('construction');
+ $helper->declareVar('assignment');
# This will persistently load in the data we want from the
# very first screen.
@@ -871,7 +881,7 @@ sub printHelper {
}
my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu;
- $helper->{VARS}->{'assignment'} = $sequenceTitle;
+ if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
# Extract map
@@ -904,7 +914,6 @@ sub printHelper {
$subdir='/home/httpd/html/res/'.$subdir;
}
-
# What can be printed is a very dynamic decision based on
# lots of factors. So we need to dynamically build this list.
# To prevent security leaks, states are only added to the wizard
@@ -923,7 +932,7 @@ sub printHelper {
push @{$printChoices}, ["<b>$resourceTitle</b> (prints what you just saw on the screen)", 'current_document', 'PAGESIZE'];
}
- $r->print($helper->{VARS}->{'postdata'});
+# $r->print($helper->{VARS}->{'postdata'});
# If we're in a sequence...
if ($helper->{'VARS'}->{'construction'} ne '1') {
@@ -992,10 +1001,9 @@ HELPERFRAGMENT
</resource>
<message><br /><big><i><b>How should the results be printed?</b></i></big><br /></message>
<choices variable="EMPTY_PAGES">
- <choice computer='0'>Print students assignments without separations (as uniform flow)</choice>
- <choice computer='1'>Start student assignment from new page (add pagefeed after each student)</choice>
- <choice computer='2'>Add one emty page after each student assignment</choice>
- <choice computer='3'>Add two emty page after each student assignment</choice>
+ <choice computer='0'>Start each student's assignment on a new page (add a pagefeed after each assignment)</choice>
+ <choice computer='1'>Add one empty page after each student's assignment</choice>
+ <choice computer='2'>Add two empty pages after each student's assignment</choice>
</choices>
</state>
CHOOSE_STUDENTS
@@ -1281,7 +1289,7 @@ sub render {
<td align='right'><b>Left margin</b>:</td>
<td align='left'><input type='text' name='$var.lmargin' value='-1.5' size='4'></td>
<td align='left'>
- <select name='$var.heightunit'>
+ <select name='$var.lmarginunit'>
<option>cm</option><option>in</option>
</select>
</td>