--- loncom/interface/printout.pl 2017/11/12 15:41:45 1.165
+++ loncom/interface/printout.pl 2024/10/16 17:48:08 1.173
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
#
-# $Id: printout.pl,v 1.165 2017/11/12 15:41:45 raeburn Exp $
+# $Id: printout.pl,v 1.173 2024/10/16 17:48:08 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -41,6 +41,7 @@ use Apache::lonmsg();
use LONCAPA::Enrollment;
use LONCAPA::Configuration;
use LONCAPA;
+use Archive::Zip qw( :ERROR_CODES );
use strict;
@@ -210,6 +211,9 @@ if ($student_names=~/_END_/) {
@names_pack=split(/_ENDPERSON_/,$student_names);
}
if ($backref) {
+ if ($backref =~ m{^(/uploaded/$LONCAPA::match_domain/$LONCAPA::match_courseid/default_\d+.page)}) {
+ $backref = $1;
+ }
print(''.&mt("[_1]Return[_2] to resource.",
"","").'
');
print(''.
@@ -443,12 +447,10 @@ foreach $texfile (@texfile) {
$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='a4';}
- if ($papera ne '') {$papera='-t'.$papera;}
+ my $papera;
+ unless ($paper eq '') {
+ $papera='-t'.$paper;
+ }
my $extra_ps_header = $perlvar{'lonLib'} .'/includepsheader.ps';
my $comma = "dvips $papera -h $extra_ps_header -Ppdf -G0 -o $new_name_file";
&busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
@@ -518,16 +520,51 @@ 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 = ;
+ close(PIPE);
+ chomp($output);
+ if ($output =~ /\Q $poss \E/) {
+ $device = $poss;
+ }
+ }
+ last if ($device ne '');
+ }
+ if ($device ne '') {
+ my ($major,$minor);
+ if (open(PIPE,"gs -v |grep 'GPL Ghostscript' 2>&1 |")) {
+ my $info = ;
+ close(PIPE);
+ chomp($info);
+ if ($info =~ /Ghostscript\s+(\d+)\.(\d+)/) {
+ ($major,$minor) = ($1,$2);
+ }
+ }
+ $comma = "gs -sDEVICE=$device -dLanguageLevel=1.5 ";
+ if (($major > 9) || (($major == 9) && ($minor >= 50))) {
+ $comma .= '--permit-file-read=* ';
+ }
+ &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";
@@ -597,26 +634,46 @@ foreach $texfile (@texfile) {
.'
';
}
}
+if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
print "
";
if ($number_of_files>1) {
+ print(''.&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));
+ }
}
- print('
'.&mt('Zip Output:')."\n
\n");
- system($statement);
- print("\n");
- $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
- print
- ''
- .&mt('A [_1]ZIP file[_2] of all the PDF files is ready for download.',
- '','')
- .'
';
+ 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
+ ''
+ .&mt('A [_1]ZIP file[_2] of all the PDF files is ready for download.',
+ '','')
+ .'
';
+ } else {
+ print ''.
+ &mt('An error occurred creating a ZIP file of all the PDF files').
+ '
';
+ }
+ 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;
@@ -960,7 +1017,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'}/|/|;