--- loncom/interface/printout.pl 2004/04/23 19:47:38 1.54 +++ loncom/interface/printout.pl 2006/04/20 02:24:08 1.97 @@ -1,7 +1,6 @@ #!/usr/bin/perl # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc. # -# $Id: printout.pl,v 1.54 2004/04/23 19:47:38 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,17 +26,126 @@ # use lib '/home/httpd/lib/perl'; -use Time::Local; -use LONCAPA::loncgi(); +use LONCAPA::loncgi; use File::Path; +use File::Basename; use IO::File; use Image::Magick; -use Apache::lonhtmlcommon; -use Apache::loncommon; +use Apache::lonhtmlcommon(); +use Apache::lonnet; +use Apache::loncommon(); use Apache::lonlocal; +use Apache::lonmsg(); +use LONCAPA::Enrollment; + +use strict; + + +# Determine if a user is operating as a student for this course/domain. +#Parameters: +# none +#Implicit: +# $env{request.role} contains the role under which this user operated this +# this request. +sub is_student { + return ($env{'request.role'}=~/^st\./); +} + +# +# Debugging: Dump the environment for debugging. +# +sub dumpenv { + print "
-------------------
"; + foreach my $key (sort (keys %env)) { + print "
$key -> $env{$key}"; + } + print "
-------------------
"; +} + +# +# This sub sends a message to the appropriate person if there was an error +# rendering the latex At present, there's only one case to consider: +# a student printing inside a course results in messages to the course coordinator. +#Parmaeters: +# identifier - The unique identifier of this cgi request. +# badresource- Filepath to most likely failing +# logfile - The contents of the log file (included in the message). +# texfile - reference to an array containing the LaTeX input file +# (included in the message). +#Implicit inputs: +# From the environment: +# cgi.$identifier.user - User doing the printing. +# cgi.$identifier.domain - Domain the user is logged in on with printing. +# cgi.$identifier.courseid - Id of the course (if this is a course). +# cgi.$identifier.coursedom- Domain in which course was constituted. +# cgi.$identifier.resources - List of resource URL's for which the print +# was attempted. +# +sub send_error_mail { + my ($identifier, $badresource, $logfile, $texfile) = @_; + my $user = $env{"cgi.$identifier.user"}; + my $domain = $env{"cgi.$identifier.domain"}; + my $courseid = $env{"cgi.$identifier.courseid"}; + my $coursedom= $env{"cgi.$identifier.coursedom"}; + my $resources= $env{"cgi.$identifier.resources"}; + + # resource file->URL + # + my $badurl = &Apache::lonnet::declutter($badresource); + + # &dumpenv(); + + + + # Only continue if there is a user, domain, courseid, course domain + # and resources: + + if(defined($user) && defined($domain) && defined($courseid) && + defined($coursedom) && defined($resources) ){ + + # Only mail if the conditions are ripe for it: + # The user is a student in the course: + # + + if (&is_student()) { + # build the subject and message body: + # print "sending message to course coordinators.
"; + + # Todo: Convert badurl into a url from file path: + + my $subject = "Error [$badurl] Print failed for $user".'@'.$domain; + my $message .= "Print failed to render LaTeX for $user".'@'."$domain\n"; + $message .= " User was attempting to print: \n"; + foreach my $resource (split(/:/,$resources)) { + $message .= " $resource\n"; + } + $message .= "--------------------LaTeX logfile:------------ \n"; + $message .= $logfile; + $message .= "-----------------LaTeX source file: ------------\n"; + + foreach my $line (@$texfile) { + $message .= "$line\n"; + } + my (undef, %receivers) = &Apache::lonfeedback::decide_receiver(undef, 0, + 1,1,1); + # print "
sending...section: $env{'request.course.sec'}"; + foreach my $dest (keys %receivers) { + # print "
dest is $dest"; + my @destinfo = split(/:/,$dest); + my $user = $destinfo[0]; + my $dom = $destinfo[1]; + + &Apache::lonmsg::user_normal_msg($user, $dom, + $subject, $message); + + # No point in looking at the return status as there's no good + # error action I can think of right now (log maybe?). + } + } + } +} $|=1; -my %origENV=%ENV; if (! &LONCAPA::loncgi::check_cookie_and_load_env()) { print <Return to last resource.

"; my $figfile = $texfile; $figfile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.dat/; my $duefile = $texfile; $duefile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.due/; #do we have figures? + # print "Figure file: $figfile\n"; if (-e $figfile) { + # print "$figfile exists\n"; 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 ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Coverting Images to EPS','Picture Conversion Status',$#content_of_file,'inline','80'); } + print('
'); + foreach my $not_eps (@content_of_file) { chomp($not_eps); if ($not_eps ne '') { + # print "Converting $not_eps"; # Debugging. my $status_statement='EPS picture for '.$not_eps; + # print "$status_statement\n"; $not_eps=~s|\/\.\/|\/|g; my $eps_f = $not_eps; - $eps_f =~ s/\.[^.]*$/\.eps/i; + # $eps_f =~ s/\.[^.]*$/\.eps/i; + $eps_f .= '.eps'; # Just append the eps ext. 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; } + $eps_f =~ s/ /\_/g; # Spaces are problematic for system commands and LaTeX. my $path=$eps_f; - $path=~s/\/([^\/]+)\.eps$//; + $path =~ s/\/([^\/]+)\.eps$//; + # print "Final file path: $path "; # Debugging File::Path::mkpath($path,0,0777); - my $image = Image::Magick->new; $not_eps =~ s/^\s+//; $not_eps =~ s/\s+$//; - if ( exists($done_conversion{$not_eps})) { - next; - } - if ($adv) { + $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|/home/httpd/html/|/|; - &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Converting to EPS '.$prettyname); } + $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); - if ($status) {print " $status ";} - $image->Set(page => '+100+200'); - $status = $image->Write($eps_f); - if ($status) {print " $status ";} + # print "Converting $not_eps -> $eps_f"; # Debugging + system("convert $not_eps $eps_f"); #check is eps exist in prtspool if(not -e $eps_f) { for (my $i=0;$i<10000;$i++) { @@ -135,7 +249,9 @@ END } } } - if ($adv) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); } + if ($advanced_role) { + &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); + } unlink($figfile); } #print "$texfile\n"; #name of the tex file for debugging only @@ -144,15 +260,17 @@ END @texfile=(); for (my $i=1;$i<=$number_of_files;$i++) { my $new_texfile=$texfile; - $new_texfile=~s/\.tex/_$i\.tex/; + $new_texfile=~s/\.tex//; + $new_texfile = sprintf("%s_%03d.tex", $new_texfile,$i); push @texfile,$new_texfile; } } 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:
"; +if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); } +print "
"; +my $num_files = @texfile; foreach $texfile (@texfile) { my $status_statement=''; my $link_text='download PDF'; @@ -160,43 +278,80 @@ foreach $texfile (@texfile) { my @stud_info=split(/_END_/,$names_pack[$ind]); my @tempo_array=split(/:/,$stud_info[0]); my $name; + my $name_range=''; if ($tempo_array[3]) { $name=$tempo_array[3]; + ($name_range) = split(/,/,$name, 2); } else { $name=$tempo_array[0].'@'.$tempo_array[1]; + $name_range = $tempo_array[0]; + } + if (($name ne "") && ($name ne '@') ) { # Could be printing codes... + $link_text=''.$name.''; + $status_statement.=$name; } - $link_text=''.$name.' '; - $status_statement.=$name; if ($#stud_info>0) { @tempo_array=split(/:/,$stud_info[-1]); if ($tempo_array[3]) { $name=$tempo_array[3]; + my ($lastname) = split(/,/, $name,2); + $name_range .= "-".$lastname; } else { $name=$tempo_array[0].'@'.$tempo_array[1]; + $name_range .= '-'.$tempo_array[0]; + } + if (($name ne "") && ($name ne '@')) { + $link_text.=' - '.$name.''; + $status_statement.=' - '.$name; + } - $link_text.='- '.$name.': '; - $status_statement.=' - '.$name; - } - if ($adv) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); } + } + if(($num_files > 1) && ($link_text eq 'download PDF')) { # Printing codes + $link_text = ''.basename($texfile,'.tex').'.pdf'; + $status_statement .= basename($texfile); + } + $name_range =~ s/'//g; # O'Neil -> ONeil e.g. + print "
"; + if ($advanced_role) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); } + # This little piece of dirt puts username ranges into the original tex + # Tex filename from which they'll propagate into the other filenames as well. + # if (-e $texfile) { + if (($name_range ne '') && ($num_files > 1)) { + my $newtexfile = $texfile; + $newtexfile =~ s/\.tex/$name_range\.tex/; + rename($texfile, $newtexfile); + $texfile = $newtexfile; + } $texfile =~ m/^(.*)\/([^\/]+)$/; 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/$name_range\.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 First LaTeX of file for table of contents", + \%prog_state,$dvi_file); + &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null", + "for $status_statement Second LaTeX of 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); @@ -204,34 +359,48 @@ foreach $texfile (@texfile) { $temporary_file = IO::File->new('>'.$logfilename); print $temporary_file 'LOGFILE
'.$body_log_file.'
'."\n"; if ($body_log_file=~m/!\s+Emergency stop/) { - #LaTeX failed to parse tex file - print "

LaTeX could not successfully parse your tex file.

"; - print "It probably has errors in it.
"; my $whereitbegins = rindex $body_log_file,'STAMPOFPASSEDRESOURCESTART'; my $whereitends = rindex $body_log_file,'STAMPOFPASSEDRESOURCEEND'; + my $badresource; + my $badtext; 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

"; - 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/^!/) { - $sygnal = 1; - } - if ($content_of_file[$i]=~m/Here is how much of/) { - $sygnal = 0; - } - if ($sygnal) { - print "$content_of_file[$i]
"; - } + $badtext = substr($body_log_file,$whereitbegins+26, $whereitends-$whereitbegins-26); + $whereitbegins = rindex $badtext,'located in'; + if ($whereitbegins != -1) { + + $badresource = substr($badtext, $whereitbegins+27, + length($badtext) - $whereitbegins - 48); + # print "
failing resourcename: $badresource
"; + } } - if ($advans_role) { + + if ($advanced_role) { + #LaTeX failed to parse tex file + print "

LaTeX could not successfully parse your tex file.

"; + print "It probably has errors in it.
"; + print "With very high probability this error occured in ".$badtext."

"; + 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/^!/) {
+		      $sygnal = 1;
+		  } 
+		  if ($content_of_file[$i]=~m/Here is how much of/) {
+		      $sygnal = 0;
+		  } 
+		  if ($sygnal) {
+		      print "$content_of_file[$i]";
+		  }  
+	      }
+	      print "
\n"; + # print "
Advanced 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); @@ -243,11 +412,29 @@ foreach $texfile (@texfile) { $texfile=~s/\/home\/httpd//; print "Your original LaTeX file "; print "\n"; + my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", "Help on printing"); + print ("$help_text"); + + } else { # Student role... + # at this point: + # $body_log_file - contains the log file. + # $name_file - is the name of the LaTeX file. + # $identifier - is the unique LaTeX identifier.l + + print "
There are errors in $badtext"; + print "
These errors prevent this resource from printing correctly"; + my $tex_handle = IO::File->new($name_file); + my @tex_contents = <$tex_handle>; + &send_error_mail($identifier, $badresource, $body_log_file, \@tex_contents); + print "
A message has been sent to the instructor describing this failure
"; + my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", "Help on printing"); + print ("$help_text"); + } } elsif ($body_log_file=~m//) { my $whereitbegins = index $body_log_file,''; - print "You are running LaTeX in the batch mode."; + print "You are running LaTeX in batch mode."; while ($whereitbegins != -1) { my $tempobegin=$whereitbegins; $whereitbegins = rindex $body_log_file,'STAMPOFPASSEDRESOURCESTART',$whereitbegins; @@ -259,24 +446,42 @@ foreach $texfile (@texfile) { $name_file =~ s/\.tex/\.dvi/; my $new_name_file = $name_file; $new_name_file =~ s/\.dvi/\.ps/; - my $comma = "dvips -Ppdf -G0 -o $new_name_file"; - system("$comma $name_file 1>/dev/null 2>/dev/null"); + my $papera=$paper; + if ($papera eq 'letter') {$papera='';} + if ($papera ne '') {$papera='-t'.$papera;} + my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file"; + &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null", + "for $status_statement now Converting to PS", + \%prog_state,$new_name_file); if (-e $new_name_file) { print "

PDF output file (see link below)

\n"; $new_name_file =~ m/^(.*)\./; - my $tempo_file = $1.'temporar.ps'; - my $name_file = $1.'.pdf'; + my $ps_file = my $tempo_file = $1.'temporar.ps'; + my $pdf_file = $1.'.pdf'; if ($laystyle eq 'album' and $numberofcolumns eq '2') { - $comma = "psnup -2 -s1.0 $new_name_file"; - system("$comma $tempo_file 1>/dev/null 2>/dev/null"); - system("ps2pdf $tempo_file $name_file 1>/dev/null 2>/dev/null"); + my $papera=$paper; + if ($papera eq 'letter') {$papera='';} + if ($papera ne '') {$papera='-p'.$papera;} + $comma = "psnup $papera -2 -s1.0 $new_name_file"; + &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null", + "for $status_statement now Modifying PS layout", + \%prog_state,$tempo_file); } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') { - $comma = 'pstops -pletter "2:0+1(0.48w,0)"'; - system("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null"); - system("ps2pdf $tempo_file $name_file 1>/dev/null 2>/dev/null"); + my $papera=$paper; + if ($papera eq 'letter') {$papera='';} + if ($papera ne '') {$papera='-p'.$papera;} + $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"'; + &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null", + "for $status_statement now Modifying PS layout", + \%prog_state,$tempo_file); + } else { - system("ps2pdf $new_name_file $name_file 1>/dev/null 2>/dev/null"); + $ps_file=$new_name_file; } + &busy_wait_command("ps2pdf $ps_file $pdf_file 1>/dev/null 2>/dev/null", + "for $status_statement now Converting PS to PDF", + \%prog_state, $pdf_file); + my $texlog = $texfile; my $texaux = $texfile; my $texdvi = $texfile; @@ -288,52 +493,84 @@ foreach $texfile (@texfile) { my @garb = ($texaux,$texdvi,$texps); # 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 file 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"; - } + print "Your PDF document"; + } + 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 $name_file =~ s/\.tex/\.dvi/; my $new_name_file = $name_file; $new_name_file =~ s/\.dvi/\.ps/; - my $comma = "dvips -Ppdf -G0 -o $new_name_file"; - system("$comma $name_file 1>/dev/null 2>/dev/null"); + my $papera=$paper; + if ($papera eq 'letter') {$papera='';} + if ($papera ne '') {$papera='-t'.$papera;} + my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file"; + &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null", + "for $status_statement now Converting to PS", + \%prog_state,$new_name_file); if (-e $new_name_file) { - print "
$final_statement "; - $final_statement=''; + print "
"; $new_name_file =~ m/^(.*)\./; - my $tempo_file = $1.'temporar.ps'; - my $name_file = $1.'.pdf'; + my $ps_file = my $tempo_file = $1.'temporar.ps'; + my $pdf_file = $1.'.pdf'; + $papera=~s/t/p/; if ($laystyle eq 'album' and $numberofcolumns eq '2') { - $comma = "psnup -2 -s1.0 $new_name_file"; - system("$comma $tempo_file 1>/dev/null 2>/dev/null"); - system("ps2pdf $tempo_file $name_file 1>/dev/null 2>/dev/null"); + $comma = "psnup $papera -2 -s1.0 $new_name_file"; + &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null", + "for $status_statement now Modifying PS layout", + \%prog_state,$tempo_file); } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') { - $comma = 'pstops -pletter "2:0+1(0.48w,0)"'; - system("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null"); - system("ps2pdf $tempo_file $name_file 1>/dev/null 2>/dev/null"); + $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"'; + &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null", + "for $status_statement now Modifying PS layout", + \%prog_state,$tempo_file); } else { - system("ps2pdf $new_name_file $name_file 1>/dev/null 2>/dev/null"); - } + $ps_file=$new_name_file; + } + my $addtoPSfile={'legal'=>'<< /PageSize [612 1008] >> setpagedevice', + 'tabloid'=>'<< /PageSize [792 1224] >> setpagedevice', + 'executive'=>,'<< /PageSize [540 720] >> setpagedevice', + 'a2'=>'<< /PageSize [1195.02 1690.09] >> setpagedevice', + 'a3'=>'<< /PageSize [842 1195.02] >> setpagedevice', + 'a4'=>'<< /PageSize [595.2 842] >> setpagedevice', + 'a5'=>'<< /PageSize [421.1 595.2] >> setpagedevice', + 'a6'=>'<< /PageSize [298.75 421.1] >> setpagedevice', + }; + if ($paper ne 'letter') { + open(FFH,'<',$ps_file) || die "Couldn't open ps file $ps_file for reading: $!\n"; + my $new_ps_file='new'.$ps_file; + open(FFHS,'>',$new_ps_file) || die "Couldn't open new ps file $new_ps_file for reading: $!\n"; + print FFHS $addtoPSfile->{$paper}."\n"; + while () { + print FFHS $_; + } + close(FFH); + close(FFHS); + $ps_file=$new_ps_file; + } + &busy_wait_command("ps2pdf $ps_file $pdf_file 1>/dev/null 2>/dev/null", + "for $status_statement now Converting PS to PDF", + \%prog_state,$pdf_file); + my $texlog = $texfile; my $texaux = $texfile; my $texdvi = $texfile; @@ -345,10 +582,10 @@ foreach $texfile (@texfile) { my @garb = ($texlog,$texaux,$texdvi,$texps); # unlink @garb; unlink $duefile; - print "$link_text"; + print "$link_text - click here to download pdf"; print "\n"; } - } + } } else { print "LaTeX file $texfile was not created successfully"; } @@ -368,8 +605,37 @@ if ($number_of_files>1) { $zipfile=~s/\/home\/httpd//; print "
A ZIP file of all the PDFs."; } -if ($adv) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); } +if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); } +print(&Apache::loncommon::end_page()); +my $done; +sub REAPER { + $done=1; +} +sub busy_wait_command { + my ($command,$message,$progress_win,$output_file)=@_; + + $SIG{CHLD} = \&REAPER; + $done=0; + my $pid=open(CMD,"$command |"); + if ($advanced_role) { + &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message); + } + while(!$done) { + sleep 1; + my $extra_msg; + if ($output_file) { + my $size=(stat($output_file))[7]; + $extra_msg=", $size bytes generated"; + } + if ($advanced_role) { + &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win, + $message.$extra_msg); + } + } + $SIG{CHLD}='IGNORE'; + close(CMD); +}