--- loncom/interface/printout.pl 2009/11/17 01:21:08 1.137.2.1
+++ loncom/interface/printout.pl 2011/05/18 11:26:44 1.149
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
#
-# $Id: printout.pl,v 1.137.2.1 2009/11/17 01:21:08 raeburn Exp $
+# $Id: printout.pl,v 1.149 2011/05/18 11:26:44 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,10 +44,15 @@ use LONCAPA::Configuration;
use strict;
my $busy_wait_timeout = 30;
+my $pdfs_converted = 0; # non zero if PDF includes (need to fixps).
+
+my $debugging = 0;
sub debug {
- my ($text) = @_;
- print "$text
\n";
+ if ($debugging) {
+ my ($text) = @_;
+ print "$text
\n";
+ }
}
# Determine if a user is operating as a student for this course/domain.
@@ -118,7 +123,7 @@ sub send_error_mail {
if (&is_student()) {
# build the subject and message body:
- # print "sending message to course coordinators.
";
+ &debug("sending message to course coordinators.");
# Todo: Convert badurl into a url from file path:
@@ -137,9 +142,9 @@ sub send_error_mail {
}
my (undef, %receivers) = &Apache::lonmsg::decide_receiver(undef, 0,
1,1,1);
- # print "
sending...section: $env{'request.course.sec'}";
+ &debug("sending...section: $env{'request.course.sec'}");
foreach my $dest (keys %receivers) {
- # print "
dest is $dest";
+ &debug("dest is $dest");
my @destinfo = split(/:/,$dest);
my $user = $destinfo[0];
my $dom = $destinfo[1];
@@ -173,7 +178,17 @@ my %perlvar=%{&LONCAPA::Configuration::r
&Apache::lonlocal::get_language_handle();
&Apache::loncommon::content_type(undef,'text/html');
$env{'request.noversionuri'} = '/cgi-bin/printout.pl';
-print(&Apache::loncommon::start_page('Creating PDF'));
+# Breadcrumbs
+#FIXME: Choose better/different breadcrumbs?!? Links?
+my $brcrum = [{'href' => '',
+ 'text' => 'Helper'}, #FIXME: Different origin possible than print out helper?
+ {'href' => '',
+ 'text' => 'Preparing Printout'},
+ {'href' => '',
+ 'text' => 'Creating PDF'}];
+print(&Apache::loncommon::start_page('Creating PDF',
+ undef,
+ {'bread_crumbs' => $brcrum,}));
my $identifier = $ENV{'QUERY_STRING'};
my $texfile = $env{'cgi.'.$identifier.'.file'};
@@ -211,8 +226,11 @@ $duefile =~ s/^(.*_printout)_\d+_\d+_\d+
# it contains the names of the files that need to be converted, one per line.
#
+&debug("Figure file is $figfile");
+
if (-e $figfile) {
- # print "$figfile exists\n";
+ &debug( "Figure file exists");
+ &debug("$figfile exists");
my %done_conversion;
my $temporary_file=IO::File->new($figfile) || die "Couldn't open fig file $figfile for reading: $!\n";
my @content_of_file = <$temporary_file>;
@@ -223,6 +241,7 @@ if (-e $figfile) {
print('
');
foreach my $not_eps (@content_of_file) {
chomp($not_eps);
+ &debug( "Being asked to convert $not_eps");
if ($not_eps ne '') {
$not_eps=~s|\/\.\/|\/|g;
if (!$done_conversion{$not_eps}) { # Only convert multiple includes once.
@@ -403,7 +422,8 @@ foreach $texfile (@texfile) {
my $papera=$paper;
if ($papera eq 'letter') {$papera='';}
if ($papera ne '') {$papera='-t'.$papera;}
- my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file";
+ 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",
"for $status_statement now Converting to PS",
\%prog_state,$new_name_file);
@@ -457,14 +477,41 @@ foreach $texfile (@texfile) {
my $ps_file = my $tempo_file = $1.'temporar.ps';
my $pdf_file = $1.'.pdf';
$papera=~s/t/p/;
+#----
+# The code below uses fixps to make pdf include in sequences work.
+#
+# $comma = "fixps --force $new_name_file";
+# &debug("FIXPS command: $comma");
+# &busy_wait_command("$comma 1>$tempo_file 2>/dev/null",
+# "for $status_statement now validating PS",
+# \%prog_state,$tempo_file);
+
+#---
+# The code below uses gs to make pdf includes in sequences work
+
+ # Use gs to fix the postscript -> level 1.5
+ # .. if pdfs were included
+
+ 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);
+
+#---
+ &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";
+ &debug("PSNUP command: $comma");
&busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
"for $status_statement now Modifying PS layout",
\%prog_state,$tempo_file);
} elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
- $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"';
- &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",
+ $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)" '.$new_name_file;
+ &debug("PSTOPS command: $comma ");
+ &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
"for $status_statement now Modifying PS layout",
\%prog_state,$tempo_file);
} else {
@@ -491,7 +538,7 @@ foreach $texfile (@texfile) {
close(FFHS);
$ps_file=$new_ps_file;
}
- &busy_wait_command("ps2pdf $ps_file $pdf_file 1>/dev/null 2>/dev/null",
+ &busy_wait_command("ps2pdf13 $ps_file $pdf_file 1>/dev/null 2>/dev/null",
"for $status_statement now Converting PS to PDF",
\%prog_state,$pdf_file);
@@ -845,6 +892,7 @@ sub create_missing_fonts {
#
sub convert_figure {
my ($not_eps) = @_;
+ &debug("in convert_figure");
my $status_statement='EPS picture for '.$not_eps;
my $eps_f = $not_eps;
@@ -881,14 +929,39 @@ sub convert_figure {
$not_eps =~ s/^\s+//;
$not_eps =~ s/\s+$//;
$not_eps =~ s/ /\\ /g;
+ my $prettyname=$not_eps;
if ($advanced_role) {
- my $prettyname=$not_eps;
$prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;
$prettyname=~s|$perlvar{'lonDocRoot'}/|/|;
&Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
'Converting to EPS '.$prettyname);
}
- system("convert $not_eps $eps_f");
+ #
+ # If the file is a PDF, need to use pdftops to convert it to a ps file.
+ # otherwise use imagemagik:
+ #
+ if($not_eps =~/\.(pdf|PDF)$/) {
+
+ #
+ # For whatever reason, pure postscript conversions have to be
+ # in the same dir as the base file:
+ #
+ $eps_f = &basename($eps_f);
+ $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.
+ } else {
+ system("convert $not_eps $eps_f");
+ if($? and $advanced_role){
+ print "
"
+ .mt("An error occured during the conversion of [_1].[_2]"
+ ."If possible try to save this image using different settings and republish it.",
+ "".$prettyname."", "
")
+ ."
';
if ($badtext) {
print &mt('There are errors in [_1].',$badtext);
} else {
print &mt('There are errors.');
}
- print "
".&mt('These errors prevent this resource from printing correctly.');
+ print '