--- loncom/interface/printout.pl 2005/03/15 11:19:28 1.74 +++ loncom/interface/printout.pl 2005/04/07 06:56:23 1.76 @@ -1,7 +1,7 @@ #!/usr/bin/perl # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc. # -# $Id: printout.pl,v 1.74 2005/03/15 11:19:28 foxr Exp $ +# $Id: printout.pl,v 1.76 2005/04/07 06:56:23 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,7 +27,7 @@ # use lib '/home/httpd/lib/perl'; -use LONCAPA::loncgi(); +use LONCAPA::loncgi; use File::Path; use IO::File; use Image::Magick; @@ -38,7 +38,6 @@ use Apache::lonlocal; use strict; $|=1; -my %origENV=%ENV; if (! &LONCAPA::loncgi::check_cookie_and_load_env()) { print <\n"; - if ($advans_role) { + if ($advanced_role) { print "The link to "; $logfilename=~s/\/home\/httpd//; print "Your log file "; @@ -324,26 +321,26 @@ foreach $texfile (@texfile) { # unlink @garb; unlink $duefile; print "Your PDF document"; - if ($advans_role) { - print "

"; - 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 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); - $texfile =~ s/\.tex$/aaaaa\.html/; - $tex_temporary_file = IO::File->new('>'.$texfile); - print $tex_temporary_file 'LOGFILE
'.$body_tex_file.'
'."\n"; - print "

"; - print "The link to "; - $texfile=~s/\/home\/httpd//; - print "Your original LaTeX file "; - print "\n"; - } + } + if ($advanced_role) { + print "

"; + 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 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); + $texfile =~ s/\.tex$/aaaaa\.html/; + $tex_temporary_file = IO::File->new('>'.$texfile); + print $tex_temporary_file 'LOGFILE
'.$body_tex_file.'
'."\n"; + print "

"; + print "The link to "; + $texfile=~s/\/home\/httpd//; + print "Your original LaTeX file "; + print "\n"; } } else { #LaTeX successfully parsed tex file