--- loncom/interface/printout.pl 2006/06/19 21:40:29 1.102
+++ loncom/interface/printout.pl 2007/04/20 20:54:24 1.123
@@ -1,6 +1,7 @@
#!/usr/bin/perl
# CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
#
+# $Id: printout.pl,v 1.123 2007/04/20 20:54:24 albertel 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,6 +39,7 @@ use Apache::loncommon();
use Apache::lonlocal;
use Apache::lonmsg();
use LONCAPA::Enrollment;
+use LONCAPA::Configuration;
use strict;
@@ -126,8 +129,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,6 +162,8 @@ 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');
@@ -186,9 +191,9 @@ END
print "Return to last 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) {
@@ -204,68 +209,89 @@ print "Return $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);
+ }
}
}
@@ -418,7 +444,7 @@ foreach $texfile (@texfile) {
print "\n";
# print "
Advanced role
";
print "The link to ";
- $logfilename=~s/\/home\/httpd//;
+ $logfilename=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
print "Your log file ";
print "\n";
#link tooriginal LaTeX file (included according Michael Hamlin desire)
@@ -431,7 +457,7 @@ foreach $texfile (@texfile) {
print $tex_temporary_file ''.$body_tex_file.'
'."\n";
print "
";
print "The link to ";
- $texfile=~s/\/home\/httpd//;
+ $texfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
print "Your original LaTeX file ";
print "\n";
my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", "Help on printing");
@@ -486,16 +512,63 @@ foreach $texfile (@texfile) {
&busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",
"for $status_statement first latex to repaginate",
\%prog_state, $name_file);
- &busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",
- "for $status_statement second latex to repaginate",
- \%prog_state, $name_file);
- &busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",
- "for $status_statement third latex to repaginate",
- \%prog_state, $name_file);
- &busy_wait_command("$comma $name_file 1>dev/null 2>/dev/null",
+ if ($tableofcontents eq 'yes') {
+ &busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",
+ "for $status_statement second latex to repaginate",
+ \%prog_state, $name_file);
+ &busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",
+ "for $status_statement third latex to repaginate",
+ \%prog_state, $name_file);
+ }
+ if ($tableofindex eq 'yes') {
+ my $idxname = $latex_file;
+ $idxname =~ s/\.tex$/\.idx/;
+ &busy_wait_command("makindex $idxname",
+ "Re-creating index file",
+ \%prog_state, $idxname);
+ &busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",
+ "for $status_statement now Recreting index (latex)",
+ \%prog_state, $dvi_file);
+
+ }
+ &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
"for $status_statement dvips to repaginate",
\%prog_state, $new_name_file);
+ #
+ # One last little hinky kinky thing.
+ # It's just possible that some fonts could not be maded
+ # at the resolution of the pdf print driver.
+ # In that case a file called missfont.log will have been
+ # created that will contain the commands that were attempted
+ # to create the missing fonts. If we basically
+ # take all the 8000 strings in that file, and
+ # replace them with 600 (the ljfour resolution)
+ # run the commands in that file and redvips,
+ # we'll be able to print the missing glyphs at 600dpi.
+ #
+ # Supposedly it is possible to tune TeX/Metafont to do this
+ # right but I failed to get that to work when following the
+ # docs at the tug site, hence this rather kludgey fix.
+ #
+ # We make the (I think) reasonable assumption that
+ # missing glyphs won't change the pagination and I think
+ # this is true because TeX/dvips will leave a space
+ # instead of these glyphs based on the font metrics
+ # (fancy way to say there will be a blank the size of the missing
+ # glyphs).
+ #
+ my $print_directory = dirname($name_file);
+ my $missfonts_file = $print_directory."/missfont.log";
+ #print("
Missing fonts file is: $missfonts_file");
+ if (-e $missfonts_file) {
+ #print("
Missing fonts file exists\n");
+ &create_missing_fonts($missfonts_file);
+ &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
+ "for $status_statement dvips generated missing fonts",
+ \%prog_state, $new_name_file);
+ }
+ #
print "\nPDF output file (see link below)
\n";
$new_name_file =~ m/^(.*)\./;
my $ps_file = my $tempo_file = $1.'temporar.ps';
@@ -534,13 +607,15 @@ foreach $texfile (@texfile) {
$texps =~ s/\.tex/\.ps/;
my @garb = ($texaux,$texdvi,$texps);
# unlink @garb;
- unlink $duefile;
+ unlink($duefile);
print "Your PDF document";
+ unlink($missfonts_file);
+
}
if ($advanced_role) {
print "
";
print "The link to ";
- $logfilename=~s/\/home\/httpd//;
+ $logfilename=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
print "Your log file ";
print "\n";
#link tooriginal LaTeX file (included according Michael Hamlin desire)
@@ -553,10 +628,11 @@ foreach $texfile (@texfile) {
print $tex_temporary_file '
'.$body_tex_file.''."\n"; print "
Zip Output:\n"); system($statement); print(""); - $zipfile=~s/\/home\/httpd//; + $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool}; print "
Doing : $command"); my $pid=open(CMD,"$command |"); if ($advanced_role) { &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message); @@ -695,7 +818,6 @@ sub busy_wait_command { $SIG{CHLD}='IGNORE'; close(CMD); } - print("
End
"); # Repagninate # What we need to do: @@ -724,10 +846,12 @@ sub repaginate { my $line; my $total_pages; # Total pages in document. my $seen_pages = 0; # There are several %%Pages only the first is useful - my $student_number = 0; # Index of student we're working on. my @pages_in_student; # For each student his/her initial page count. my $max_pages = 0; # Pages in 'longest' student. my $page_number = 0; + &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, + &mt("Counting pages for student: [_1]",1)); + while ($line =