--- loncom/interface/printout.pl 2006/12/19 10:39:28 1.119
+++ loncom/interface/printout.pl 2007/02/23 00:39:31 1.122
@@ -1,6 +1,7 @@
#!/usr/bin/perl
# CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
#
+# $Id: printout.pl,v 1.122 2007/02/23 00:39:31 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -127,8 +128,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";
@@ -187,9 +188,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) {
@@ -603,9 +604,9 @@ 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;
+ unlink($missfonts_file);
}
if ($advanced_role) {
@@ -756,11 +757,11 @@ foreach $texfile (@texfile) {
$texps =~ s/\.tex/\.ps/;
my @garb = ($texlog,$texaux,$texdvi,$texps);
# unlink @garb;
- unlink $duefile;
+ unlink($duefile);
print "$link_text - click here to download pdf";
print "\n";
}
- unlink $missfonts_file;
+ unlink($missfonts_file);
}
} else {
@@ -865,7 +866,7 @@ sub repaginate {
#
if ($line =~ /^%%Page:/) {
- my @pageinfo = split(/ /, $line);
+ my @pageinfo = split(/\s+/, $line);
if ($page_number < $pageinfo[1]) {
$page_number = $pageinfo[1];
} elsif ($pageinfo[2] ne 1) {