--- loncom/interface/printout.pl 2004/04/01 15:31:06 1.53
+++ loncom/interface/printout.pl 2004/12/20 21:15:20 1.71
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
#
-# $Id: printout.pl,v 1.53 2004/04/01 15:31:06 albertel Exp $
+# $Id: printout.pl,v 1.71 2004/12/20 21:15:20 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -27,15 +27,16 @@
#
use lib '/home/httpd/lib/perl';
-use Time::Local;
use LONCAPA::loncgi();
use File::Path;
use IO::File;
use Image::Magick;
use Apache::lonhtmlcommon;
+use Apache::lonnet();
use Apache::loncommon;
use Apache::lonlocal;
+use strict;
$|=1;
my %origENV=%ENV;
if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {
@@ -60,13 +61,15 @@ END
my $texfile = $ENV{'cgi.'.$identifier.'.file'};
my $laystyle = $ENV{'cgi.'.$identifier.'.layout'};
my $numberofcolumns = $ENV{'cgi.'.$identifier.'.numcol'};
+ my $paper = $ENV{'cgi.'.$identifier.'.paper'};
my $selectionmade = $ENV{'cgi.'.$identifier.'.selection'};
my $tableofcontents = $ENV{'cgi.'.$identifier.'tableofcontents'};
my $tableofindex = $ENV{'cgi.'.$identifier.'tableofindex'};
my $advans_role = $ENV{'cgi.'.$identifier.'role'};
my $number_of_files = $ENV{'cgi.'.$identifier.'numberoffiles'}+1;
my $student_names = $ENV{'cgi.'.$identifier.'studentnames'};
- my $backref = $ENV{'cgi.'.$identifier.'backref'};
+ my $backref = &Apache::lonnet::unescape($ENV{'cgi.'.$identifier.'backref'});
+
my $adv = $ENV{'request.role.adv'};
@@ -84,13 +87,13 @@ END
#do we have figures?
if (-e $figfile) {
my %done_conversion;
- my $temporary_file=IO::File->new($figfile) || die "Couldn't open file for reading: $!\n";
+ my $temporary_file=IO::File->new($figfile) || die "Couldn't open fig file $figfile for reading: $!\n";
my @content_of_file = <$temporary_file>;
close $temporary_file;
my $noteps;
my %prog_state;
- if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Coverting Images to EPS','Picture Conversion Status',$#content_of_file,'inline'); }
- foreach $not_eps (@content_of_file) {
+ if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Coverting Images to EPS','Picture Conversion Status',$#content_of_file,'inline','80'); }
+ foreach my $not_eps (@content_of_file) {
chomp($not_eps);
if ($not_eps ne '') {
my $status_statement='EPS picture for '.$not_eps;
@@ -100,9 +103,12 @@ END
if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) {
$eps_f=~s/\/home\/([^\/]+)\/public_html/$1/;
$eps_f = '/home/httpd/prtspool/'.$eps_f;
- } else {
- $eps_f=~m/\/home\/httpd\/html\/res\/(.+)/;
+ } 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;
}
my $path=$eps_f;
$path=~s/\/([^\/]+)\.eps$//;
@@ -116,10 +122,10 @@ END
if ($adv) {
my $prettyname=$not_eps;
$prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;
- $prettyname=~s|/home/httpd/html/|/|;
+ $prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|;
&Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Converting to EPS '.$prettyname); }
$done_conversion{$not_eps}=1;
- $status = $image->Read($not_eps);
+ my $status = $image->Read($not_eps);
if ($status) {print " $status ";}
$image->Set(page => '+100+200');
$status = $image->Write($eps_f);
@@ -151,8 +157,9 @@ END
my $ind=-1;
my %prog_state;
-if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline'); }
-my $final_statement="Return to last resource.
Generated PDF File for:
";
+print "Return to last resource.
";
+if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); }
+print "
";
foreach $texfile (@texfile) {
my $status_statement='';
my $link_text='download PDF';
@@ -165,7 +172,7 @@ foreach $texfile (@texfile) {
} else {
$name=$tempo_array[0].'@'.$tempo_array[1];
}
- $link_text=''.$name.' ';
+ $link_text=''.$name.'';
$status_statement.=$name;
if ($#stud_info>0) {
@tempo_array=split(/:/,$stud_info[-1]);
@@ -174,7 +181,7 @@ foreach $texfile (@texfile) {
} else {
$name=$tempo_array[0].'@'.$tempo_array[1];
}
- $link_text.='- '.$name.': ';
+ $link_text.=' - '.$name.'';
$status_statement.=' - '.$name;
}
if ($adv) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); }
@@ -183,20 +190,28 @@ foreach $texfile (@texfile) {
my $name_file = $2;
my $path_file = $1.'/';
chdir $path_file;
- system("latex $name_file 1>/dev/null 2>/dev/null");
+ 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);
if ($tableofcontents eq 'yes') {
- system("latex $name_file 1>/dev/null 2>/dev/null");
+ &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null",
+ "for $status_statement now LaTeXing file for table of contents",
+ \%prog_state,$dvi_file);
} #to create table of contents
my $idxname=$name_file;
$idxname=~s/\.tex$/\.idx/;
if ($tableofindex eq 'yes') {
- system("makeindex $idxname");
- system("latex $name_file 1>/dev/null 2>/dev/null");
+ &busy_wait_command("makeindex $idxname",
+ "making index file",
+ \%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);
} #to create index
#Do we have a latex error in the log file?
- my $logfilename = $texfile;
- $logfilename =~ s/\.tex$/\.log/;
- my $temporary_file=IO::File->new($logfilename) || die "Couldn't open file for reading: $!\n";
+ my $logfilename = $texfile; $logfilename =~ s/\.tex$/\.log/;
+ my $temporary_file=IO::File->new($logfilename) || die "Couldn't open log file $logfilename for reading: $!\n";
my @content_of_file = <$temporary_file>;
close $temporary_file;
my $body_log_file = join(' ',@content_of_file);
@@ -212,7 +227,7 @@ foreach $texfile (@texfile) {
if ($whereitbegins!=-1 and $whereitends!=-1) {
print "With very high probability this error occured in ".substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26)."
";
}
- print "Here are the error messages in the LaTeX log file
";
+ print "Here are the error messages in the LaTeX log file
"; my $sygnal = 0; for (my $i=0;$i<=$#content_of_file;$i++) { if ($content_of_file[$i]=~m/^Runaway argument?/ or $content_of_file[$i]=~m/^!/) { @@ -222,16 +237,17 @@ foreach $texfile (@texfile) { $sygnal = 0; } if ($sygnal) { - print "$content_of_file[$i]\n"; if ($advans_role) { print "The link to "; $logfilename=~s/\/home\/httpd//; print "Your log file "; print "\n"; #link tooriginal LaTeX file (included according Michael Hamlin desire) - my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open file for reading: $!\n"; + my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n"; my @tex_content_of_file = <$tex_temporary_file>; close $tex_temporary_file; my $body_tex_file = join(' ',@tex_content_of_file); @@ -247,7 +263,7 @@ foreach $texfile (@texfile) { } elsif ($body_log_file=~m/
"; + print "$content_of_file[$i]"; } } + print "