--- loncom/interface/printout.pl 2002/05/09 15:46:01 1.7
+++ loncom/interface/printout.pl 2002/08/01 18:09:27 1.13
@@ -6,7 +6,9 @@ print "\n";
print "OUTPUT is in the PDF FILE (see link below)
\n";
my ($texfile,$laystyle) = split(/&/,$ENV{'QUERY_STRING'});
my $figfile = $texfile;
-$figfile =~ s/\.tex/\.dat/;
+$figfile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.dat/;
+my $duefile = $texfile;
+$duefile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.due/;
if (-e $figfile) {
my $temporary_file=IO::File->new($figfile) || die "Couldn't open file for reading: $!\n";
my @content_of_file = <$temporary_file>;
@@ -15,9 +17,9 @@ if (-e $figfile) {
foreach $not_eps (@content_of_file) {
if ($not_eps ne '') {
my $eps_f = $not_eps;
- $eps_f =~ s/\..*$/\.eps/;
+ $eps_f =~ s/\.[^.]*$/\.eps/i;
$_ = $eps_f;
- m/\/(\w+\.eps)/;
+ m/\/([^\/]+)$/;
$eps_f = '/home/httpd/prtspool/'.$1;
my $image = Image::Magick->new;
$not_eps =~ s/^\s+//;
@@ -64,8 +66,7 @@ $texdvi =~ s/\.tex/\.dvi/;
$texps =~ s/\.tex/\.ps/;
my @garb = ($texlog,$texaux,$texdvi,$texps);
unlink @garb;
-
-
+unlink $duefile;
print "Your PDF document\n";
print "\n";