--- loncom/interface/printout.pl 2013/07/19 18:24:16 1.155
+++ loncom/interface/printout.pl 2023/04/15 21:50:34 1.169
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
#
-# $Id: printout.pl,v 1.155 2013/07/19 18:24:16 bisitz Exp $
+# $Id: printout.pl,v 1.169 2023/04/15 21:50:34 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,6 +40,8 @@ use Apache::lonlocal;
use Apache::lonmsg();
use LONCAPA::Enrollment;
use LONCAPA::Configuration;
+use LONCAPA;
+use Archive::Zip qw( :ERROR_CODES );
use strict;
@@ -201,7 +203,7 @@ my $tableofindex = $env{'cgi.'.$identifi
my $advanced_role = $env{'cgi.'.$identifier.'.role'};
my $number_of_files = $env{'cgi.'.$identifier.'.numberoffiles'}+1;
my $student_names = $env{'cgi.'.$identifier.'.studentnames'};
-my $backref = &Apache::lonnet::unescape($env{'cgi.'.$identifier.'.backref'});
+my $backref = &unescape($env{'cgi.'.$identifier.'.backref'});
my @names_pack=();
@@ -209,8 +211,13 @@ if ($student_names=~/_END_/) {
@names_pack=split(/_ENDPERSON_/,$student_names);
}
if ($backref) {
- print('<p>'.&mt("[_1]Return[_2] to editing resource.",
+ if ($backref =~ m{^(/uploaded/$LONCAPA::match_domain/$LONCAPA::match_courseid/default_\d+.page)}) {
+ $backref = $1;
+ }
+ print('<p>'.&mt("[_1]Return[_2] to resource.",
"<a href=\"$backref\"><b>","</b></a>").'</p>');
+ print('<p><a href="javascript:gopost(\'/adm/printout\',\''.$backref.'\');">'.
+ &mt("Change Printing Options").'</a></p>'."\n");
}
my $figfile = $texfile;
$figfile =~ s/^(.*_printout)_\d+_\d+_\d+\.tex/$1\.dat/;
@@ -309,11 +316,20 @@ foreach $texfile (@texfile) {
my $name_range='';
# $name -> Either user's full name or username:domain
- # $name_range -> Either user's last name or usrname.
+ # $name_range -> Either user's last name or username.
if ($tempo_array[3]) {
$name=$tempo_array[3];
- ($name_range) = split(/,/,$name, 2);
+ $name =~ s{^\s+|\s+$}{}g;
+ if ($name =~ /,/) {
+ ($name_range) = split(/,/,$name, 2);
+ } elsif ($name =~ /\s/) {
+ $name_range = $name;
+ $name_range =~ s/\s+/_/;
+ } else {
+ $name_range = $name;
+ }
+ $name_range =~ s/[^\w\:\-]+//g;
} else {
$name=$tempo_array[0].':'.$tempo_array[1];
$name_range = $tempo_array[0];
@@ -336,8 +352,18 @@ foreach $texfile (@texfile) {
@tempo_array=split(/:/,$stud_info[-1]);
if ($tempo_array[3]) {
$name=$tempo_array[3];
- my ($lastname) = split(/,/, $name,2);
+ $name =~ s{^\s+|\s+$}{}g;
+ my $lastname;
+ if ($name =~ /,/) {
+ ($lastname) = split(/,/, $name,2);
+ } elsif ($name =~ /\s/) {
+ $lastname = $name;
+ $lastname =~ s/\s+/_/;
+ } else {
+ $lastname = $name;
+ }
$name_range .= "-".$lastname;
+ $name_range =~ s/[^\w\:\-]+//g;
} else {
$name=$tempo_array[0].':'.$tempo_array[1];
$name_range .= '-'.$tempo_array[0];
@@ -419,8 +445,13 @@ foreach $texfile (@texfile) {
$name_file =~ s/\.tex/\.dvi/;
my $new_name_file = $name_file;
$new_name_file =~ s/\.dvi/\.ps/;
+# Explicitly include a switch for papertype, otherwise dvips will default
+# to whatever is listed first in config.ps (which in most cases is a4).
+# Historically (since 2004) LON-CAPA printing expected to use the default,
+# i.e., a papertype of a4, when the user selected letter [8 1/2 x 11 in]
+# in the Layout options, so I follow that convention if $papera is letter.
my $papera=$paper;
- if ($papera eq 'letter') {$papera='';}
+ if ($papera eq 'letter') {$papera='a4';}
if ($papera ne '') {$papera='-t'.$papera;}
my $extra_ps_header = $perlvar{'lonLib'} .'/includepsheader.ps';
my $comma = "dvips $papera -h $extra_ps_header -Ppdf -G0 -o $new_name_file";
@@ -491,16 +522,39 @@ foreach $texfile (@texfile) {
# Use gs to fix the postscript -> level 1.5
# .. if pdfs were included
+ #
+ # pswrite device was removed from ghostscript 9.09 and later,
+ # (ps2write device is used instead).
+ # check which device is available, and use as the value
+ # passed via -sDEVICE= arg in gs call to fix the postscript.
+ #
if ($pdfs_converted > 0) {
- $comma = "gs -sDEVICE=pswrite -dLanguageLevel=1.5 ";
- &busy_wait_command("$comma -o $tempo_file $new_name_file 2>/dev/null 1>/dev/null",
- "for $status_statement now validating PS",
- \%prog_state, $tempo_file);
-
+ my @possdevices = qw(ps2write pswrite);
+ my $device;
+ foreach my $poss (@possdevices) {
+ if (open(PIPE,"gs -h |grep ' $poss ' 2>&1 |")) {
+ my $output = <PIPE>;
+ close(PIPE);
+ chomp($output);
+ if ($output =~ /\Q $poss \E/) {
+ $device = $poss;
+ }
+ }
+ last if ($device ne '');
+ }
+ if ($device ne '') {
+ $comma = "gs -sDEVICE=$device -dLanguageLevel=1.5 ";
+ &busy_wait_command("$comma -o $tempo_file $new_name_file 2>/dev/null 1>/dev/null",
+ "for $status_statement now validating PS",
+ \%prog_state, $tempo_file);
+
#---
- &busy_wait_command("mv $tempo_file $new_name_file",
- 'File move', \%prog_state, $new_name_file);
+ if (-e $tempo_file) {
+ &busy_wait_command("mv $tempo_file $new_name_file",
+ 'File move', \%prog_state, $new_name_file);
+ }
+ }
}
if ($laystyle eq 'album' and $numberofcolumns eq '2') {
$comma = "psnup $papera -2 -s1.0 $new_name_file";
@@ -570,26 +624,46 @@ foreach $texfile (@texfile) {
.'</p>';
}
}
+if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
print "<br />";
if ($number_of_files>1) {
+ print('<p>'.&mt('Zip Output:')."\n");
+ my %zip_prog_state;
+ if ($advanced_role) { %zip_prog_state=&Apache::lonhtmlcommon::Create_PrgWin('',$number_of_files); }
my $zipfile=$texfile[0];
$zipfile=~s/\.tex/\.zip/;
- my $statement="zip $zipfile";
+ my $zip = Archive::Zip->new();
+ my $counter = 0;
foreach my $file (@texfile) {
- $file=~s/\.tex/.\pdf/;
- $statement.=' '.$file;
+ $file=~s/\.tex/.\pdf/;
+ my $dest=$file;
+ $dest=~s{^\Q$perlvar{'lonPrtDir'}\E}{prtspool};
+ $zip->addFile($file,$dest);
+ $dest=~s/^prtspool//;
+ $counter ++;
+ if ($advanced_role) {
+ &Apache::lonhtmlcommon::Update_PrgWin('',\%zip_prog_state,
+ &mt('[_1] added to zip archive ([_2] of [_3]',
+ $dest,$counter,$number_of_files));
+ }
+ }
+ if ($advanced_role) {
+ &Apache::lonhtmlcommon::Update_PrgWin('',\%zip_prog_state,&mt('Writing zip file'));
+ }
+ if ($zip->writeToFileNamed($zipfile) == AZ_OK) {
+ $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
+ print
+ '<p>'
+ .&mt('A [_1]ZIP file[_2] of all the PDF files is ready for download.',
+ '<a href="'.$zipfile.'">','</a>')
+ .'</p>';
+ } else {
+ print '<p class="LC_error">'.
+ &mt('An error occurred creating a ZIP file of all the PDF files').
+ '</p>';
}
- print('<p>'.&mt('Zip Output:')."\n<pre>\n");
- system($statement);
- print("</pre></p>\n");
- $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
- print
- '<p>'
- .&mt('A [_1]ZIP file[_2] of all the PDF files is ready for download.',
- '<a href="'.$zipfile.'">','</a>')
- .'</p>';
+ if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%zip_prog_state); }
}
-if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
print(&Apache::loncommon::end_page());
my $done;
@@ -914,7 +988,7 @@ sub convert_figure {
# Spaces are problematic for system commands and LaTeX, replace with _
- $eps_f =~ s/ /\_/g;
+ $eps_f =~ s/ /\_/g;
#
# If the file is already an .eps or .ps file (eps_f still has the original
@@ -933,7 +1007,6 @@ sub convert_figure {
&File::Path::mkpath($path,0,0777);
$not_eps =~ s/^\s+//;
$not_eps =~ s/\s+$//;
- $not_eps =~ s/ /\\ /g;
my $prettyname=$not_eps;
if ($advanced_role) {
$prettyname=~s|$perlvar{'lonDocRoot'}/|/|;
@@ -953,18 +1026,29 @@ sub convert_figure {
$eps_f = $perlvar{'lonPrtDir'}.'/'.$eps_f;
&debug("Converting pdf $not_eps to postscript: $eps_f");
- system("pdftops $not_eps $eps_f");
- $pdfs_converted++; # Need to fix ps in last pass.
+ my @args = ('pdftops',$not_eps,$eps_f);
+ system({$args[0]} @args); # Indirect object forces list processing mode.
+ # See perlfunc documentation for exec().
+ if ($? and $advanced_role) {
+ print '<p class="LC_warning">'
+ .&mt('An error occurred during the conversion of [_1] to postscript.',
+ '<span class="LC_filename">'.$prettyname.'</span>')
+ .'</p>';
+ } else {
+ $pdfs_converted++; # Need to fix ps in last pass.
+ }
} else {
- system("convert $not_eps $eps_f");
- if($? and $advanced_role){
- print '<p class="LC_warning">'
- .&mt('An error occured during the conversion of [_1].',
+ my @args = ('convert',$not_eps,$eps_f);
+ system({$args[0]} @args); # Indirect object forces list processing mode.
+ # See perlfunc documentation for exec().
+ if ($? and $advanced_role) {
+ print '<p class="LC_warning">'
+ .&mt('An error occurred during the conversion of [_1].',
'<span class="LC_filename">'.$prettyname.'</span>')
- .'<br />'
- .&mt('If possible try to save this image using different settings and republish it.')
- .'</p>';
- }
+ .'<br />'
+ .&mt('If possible try to save this image using different settings and republish it.')
+ .'</p>';
+ }
}
if (not -e $eps_f) {
@@ -1052,7 +1136,7 @@ sub analyze_logfile {
print "<h2>".&mt('LaTeX could not successfully parse your TeX file.')."</h2>";
print &mt('It probably has errors in it.')."<br />";
if ($badtext) {
- print &mt('With very high probability this error occured in [_1].',$badtext)
+ print &mt('With very high probability this error occurred in [_1].',$badtext)
."<br /><br />";
}
print &mt('Here are the error messages in the LaTeX log file:')
@@ -1141,7 +1225,7 @@ sub analyze_logfile {
my $whereitends = index $body_log_file,'STAMPOFPASSEDRESOURCEEND',$whereitbegins;
print "<br />"
.&mt('It has found an error in [_1][_2]and corrected it.',substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26),"<br />")."\n";
- print &mt('Usually this correction is valid but you probably need to check the indicated resource one more time and implement neccessary corrections by yourself.')."\n";
+ print &mt('Usually this correction is valid but you probably need to check the indicated resource one more time and implement necessary corrections by yourself.')."\n";
$whereitbegins = index $body_log_file,'<inserted text>',$tempobegin+10;
}