--- loncom/interface/printout.pl 2006/09/14 17:04:42 1.110
+++ loncom/interface/printout.pl 2008/03/11 01:48:57 1.132
@@ -1,6 +1,7 @@
#!/usr/bin/perl
# CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
#
+# $Id: printout.pl,v 1.132 2008/03/11 01:48:57 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,6 +30,7 @@ use lib '/home/httpd/lib/perl';
use LONCAPA::loncgi;
use File::Path;
use File::Basename;
+use File::Copy;
use IO::File;
use Image::Magick;
use Apache::lonhtmlcommon();
@@ -37,9 +39,11 @@ use Apache::loncommon();
use Apache::lonlocal;
use Apache::lonmsg();
use LONCAPA::Enrollment;
+use LONCAPA::Configuration;
use strict;
+my $busy_wait_timeout = 30;
# Determine if a user is operating as a student for this course/domain.
#Parameters:
@@ -126,8 +130,8 @@ sub send_error_mail {
foreach my $line (@$texfile) {
$message .= "$line\n";
}
- my (undef, %receivers) = &Apache::lonfeedback::decide_receiver(undef, 0,
- 1,1,1);
+ my (undef, %receivers) = &Apache::lonmsg::decide_receiver(undef, 0,
+ 1,1,1);
# print "
sending...section: $env{'request.course.sec'}";
foreach my $dest (keys %receivers) {
# print "
dest is $dest";
@@ -159,9 +163,11 @@ Your cookie information is incorrect.
END
return;
}
+
+my %perlvar=%{&LONCAPA::Configuration::read_conf('loncapa.conf')};
&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'));
my $identifier = $ENV{'QUERY_STRING'};
@@ -182,13 +188,14 @@ END
if ($student_names=~/_END_/) {
@names_pack=split(/_ENDPERSON_/,$student_names);
}
-
-print "Return to last resource.
";
-
+ if ($backref) {
+ print('
'.&mt("[_1]Return[_2] to editing resource.", + "","").'
'); + } my $figfile = $texfile; - $figfile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.dat/; + $figfile =~ s/^(.*_printout)_\d+_\d+_\d+\.tex/$1\.dat/; my $duefile = $texfile; - $duefile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.due/; + $duefile =~ s/^(.*_printout)_\d+_\d+_\d+\.tex/$1\.due/; #do we have figures? # print "Figure file: $figfile\n"; if (-e $figfile) { @@ -199,74 +206,94 @@ print "Return'); foreach my $not_eps (@content_of_file) { chomp($not_eps); if ($not_eps ne '') { - # print "Converting $not_eps"; # Debugging. + # print "Converting $not_eps"; # Debugging. my $status_statement='EPS picture for '.$not_eps; # print "$status_statement\n"; $not_eps=~s|\/\.\/|\/|g; my $eps_f = $not_eps; # $eps_f =~ s/\.[^.]*$/\.eps/i; - $eps_f .= '.eps'; # Just append the eps ext. if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) { $eps_f=~s/\/home\/([^\/]+)\/public_html/$1/; - $eps_f = '/home/httpd/prtspool/'.$eps_f; - } elsif ($eps_f=~/$Apache::lonnet::perlvar{'lonDocRoot'}\/res\//) { - $eps_f=~m/$Apache::lonnet::perlvar{'lonDocRoot'}\/res\/(.+)/; - $eps_f = '/home/httpd/prtspool/'.$1; - } elsif ($eps_f=~/$Apache::lonnet::perlvar{'lonUsersDir'}\//) { - $eps_f=~/$Apache::lonnet::perlvar{'lonUsersDir'}\/([^\/]+)\/\w\/\w\/\w\/(.+)/; - $eps_f = '/home/httpd/prtspool/'.$1.'/'.$2; + $eps_f = $perlvar{'lonPrtDir'}.'/'.$eps_f; + } elsif ($eps_f=~/$perlvar{'lonDocRoot'}\/res\//) { + $eps_f=~m/$perlvar{'lonDocRoot'}\/res\/(.+)/; + $eps_f = $perlvar{'lonPrtDir'}.'/'.$1; + } elsif ($eps_f=~/$perlvar{'lonUsersDir'}\//) { + $eps_f=~/$perlvar{'lonUsersDir'}\/([^\/]+)\/\w\/\w\/\w\/(.+)/; + $eps_f = $perlvar{'lonPrtDir'}.'/'.$1.'/'.$2; } $eps_f =~ s/ /\_/g; # Spaces are problematic for system commands and LaTeX. - my $path=$eps_f; - $path =~ s/\/([^\/]+)\.eps$//; - # print "Final file path: $path "; # Debugging - File::Path::mkpath($path,0,0777); - $not_eps =~ s/^\s+//; - $not_eps =~ s/\s+$//; - $not_eps =~ s/ /\\ /g; - if ( exists($done_conversion{$not_eps})) { next; } - if ($advanced_role) { - my $prettyname=$not_eps; - $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|; - $prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|; - &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, - 'Converting to EPS '.$prettyname); - } - $done_conversion{$not_eps}=1; - # print "Converting $not_eps -> $eps_f"; # Debugging - system("convert $not_eps $eps_f"); - # check is eps exist in prtspool - if (not -e $eps_f) { - # converting an animated gif creates either: - # anim.gif.eps.0 - # or - # anim.gif-0.eps - for (my $i=0;$i<10000;$i++) { - if (-e $eps_f.'.'.$i) { - rename($eps_f.'.'.$i, $eps_f); - last; - } - my $anim_eps = $eps_f; - $anim_eps =~ s/(\.[^.]*)\.eps$/$1-$i\.eps/i; - if (-e $anim_eps) { - rename($anim_eps, $eps_f); - last; + # + # If the file is already an .eps or .ps file, + # We really just need to copy it from where it was to prtspool + # but with the spaces substituted to _'s. + # + my ($nsname,$path, $sext) = &fileparse($eps_f, qr/\.(ps|eps)/i); + if ($sext =~/ps$/i) { + # print "$not_eps is a postscript file. copy to $path\n"; + &File::Path::mkpath($path,0,0777); + #print("Made path: $path"); + #$not_eps =~ s/^\s+//; + #$not_eps =~ s/\s+$//; + #$not_eps =~ s/ /\__/g; + #print("Copying $not_eps to $eps_f\n"); + copy("$not_eps", "$eps_f"); + # print "Copy complete\n"; + } else { + + $eps_f .= '.eps'; # Just append the eps ext. + my $path=$eps_f; + $path =~ s/\/([^\/]+)\.eps$//; + # print "Final file path: $path "; # Debugging + &File::Path::mkpath($path,0,0777); + $not_eps =~ s/^\s+//; + $not_eps =~ s/\s+$//; + $not_eps =~ s/ /\\ /g; + if ( exists($done_conversion{$not_eps})) { next; } + 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); + } + $done_conversion{$not_eps}=1; + # print "Converting $not_eps -> $eps_f"; # Debugging + system("convert $not_eps $eps_f"); + # check is eps exist in prtspool + if (not -e $eps_f) { + # converting an animated gif creates either: + # anim.gif.eps.0 + # or + # anim.gif-0.eps + for (my $i=0;$i<10000;$i++) { + if (-e $eps_f.'.'.$i) { + rename($eps_f.'.'.$i, $eps_f); + last; + } + my $anim_eps = $eps_f; + $anim_eps =~ s/(\.[^.]*)\.eps$/$1-$i\.eps/i; + if (-e $anim_eps) { + rename($anim_eps, $eps_f); + last; + } } } - } - # imagemagick 6.2.0-6.2.7 fails to properly handle - # convert anim.gif anim.gif.eps - # it creates anim.eps instead. - if (not -e $eps_f) { - my $eps_f2 = $eps_f; - $eps_f2 =~ s/\.[^.]*\.eps$/\.eps/i; - if(-e $eps_f2) { - rename($eps_f2,$eps_f); + + # imagemagick 6.2.0-6.2.7 fails to properly handle + # convert anim.gif anim.gif.eps + # it creates anim.eps instead. + if (not -e $eps_f) { + my $eps_f2 = $eps_f; + $eps_f2 =~ s/\.[^.]*\.eps$/\.eps/i; + if(-e $eps_f2) { + rename($eps_f2,$eps_f); + } } } @@ -350,17 +377,17 @@ foreach $texfile (@texfile) { my $name_file = $2; my $path_file = $1.'/'; chdir $path_file; - my $dvi_file= $name_file; $dvi_file =~ s/\.tex/$name_range\.dvi/; + my $dvi_file= $name_file; $dvi_file =~ s/\.tex$/\.dvi/; &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null", "for $status_statement now LaTeXing file", - \%prog_state,$dvi_file); + \%prog_state,$dvi_file, $busy_wait_timeout); if ($tableofcontents eq 'yes') { &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null", "for $status_statement First LaTeX of file for table of contents", - \%prog_state,$dvi_file); + \%prog_state,$dvi_file, $busy_wait_timeout); &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null", "for $status_statement Second LaTeX of file for table of contents", - \%prog_state,$dvi_file); + \%prog_state,$dvi_file,$busy_wait_timeout); } #to create table of contents my $idxname=$name_file; $idxname=~s/\.tex$/\.idx/; @@ -370,7 +397,7 @@ foreach $texfile (@texfile) { \%prog_state,$idxname); &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null", "for $status_statement now LaTeXing file for index section", - \%prog_state,$dvi_file); + \%prog_state,$dvi_file, $busy_wait_timeout); } #to create index #Do we have a latex error in the log file? my $logfilename = $texfile; $logfilename =~ s/\.tex$/\.log/; @@ -419,10 +446,10 @@ foreach $texfile (@texfile) { print "\n"; # print "'.$body_tex_file.''."\n"; print "
'.$body_tex_file.''."\n"; print "
Zip Output:\n"); system($statement); print(""); - $zipfile=~s/\/home\/httpd//; + $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool}; print "
Executing $command, the output file $output_file did not grow\n"; + print "after $timeout seconds. This may indicate $command\n"; + print "is in an infinite loop.\n"; + print "See if printing fewer copies helps. Please contact LON-CAPA\n"; + print "support about this in any event."; + print "
"; + kill(9, $pid); # Reaper will do the rest...I hope there's errors in the log. + } + } else { + $last_size = $size; + $unchanged_time = 0; + } } if ($advanced_role) { &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win, @@ -769,8 +896,8 @@ sub repaginate { # bottom of the page, m the page number within the document. # - if ($line =~ /^%%Page:/) { - my @pageinfo = split(/ /, $line); + if ($line =~ /^%%Page:\s+\d+\s+\d+/) { + my @pageinfo = split(/\s+/, $line); if ($page_number < $pageinfo[1]) { $page_number = $pageinfo[1]; } elsif ($pageinfo[2] ne 1) { @@ -852,3 +979,57 @@ sub repaginate { } +# +# Create missing fonts given a latex missfonts.log file. +# This file will have lines like: +# +# mktexpk --mfmode ljfour --bdpi 8000 --mag 1+0/8000 --dpi 8000 tcrm0500 +# +# We want to execute those lines with the 8000's changed to 600's +# in order to match the resolution of the ljfour printer. +# Of course if some wiseguy has changed the default printer from ljfour +# in the dvips's config.ps file that will break so we'll also +# ensure that --mfmode is ljfour. +# +sub create_missing_fonts { + my ($fontfile, $state) = @_; + + # Open and read in the font file..we'll read it into the array + # font_commands. + # + open(my $font_handle, $fontfile); + my @font_commands = <$font_handle>; + + # make the list contain each command only once + my %uniq; + @font_commands = map { $uniq{$_}++ == 0 ? $_ : () } @font_commands; + + # Now process each command replacing the appropriate 8000's with + # 600's ensuring that font names with 8000's in them are not corrupted. + # and if the --mfmode is not ljfour we turn it into ljfour. + # Then we execute the command. + # + + foreach my $command (@font_commands) { + #print("