[BACK]Return to printout.pl CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/printout.pl between versions 1.69 and 1.92

version 1.69, 2004/09/09 15:30:49 version 1.92, 2005/10/31 21:48:07
Line 1 Line 1
 #!/usr/bin/perl  #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.  # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #  #
 # $Id$  
 #  #
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
 #  #
Line 27 Line 26
 #  #
   
 use lib '/home/httpd/lib/perl';  use lib '/home/httpd/lib/perl';
 use LONCAPA::loncgi();  use LONCAPA::loncgi;
 use File::Path;  use File::Path;
   use File::Basename;
 use IO::File;  use IO::File;
 use Image::Magick;  use Image::Magick;
 use Apache::lonhtmlcommon;  use Apache::lonhtmlcommon;
   use Apache::lonnet;
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonmsg;
   use LONCAPA::Enrollment;
   
 use strict;  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 "<br />-------------------<br />";
       foreach my $key (sort (keys %env)) {
    print "<br />$key -> $env{$key}";
       }
       print "<br />-------------------<br />";
   }
   
   #
   #   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.<br />";
   
       # 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 "<br /> sending...section:  $env{'request.course.sec'}";
       foreach my $dest (keys %receivers) {
    # print "<br /> 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;  $|=1;
 my %origENV=%ENV;  
 if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {  if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {
     print <<END;      print <<END;
 Content-type: text/html  Content-type: text/html
Line 57  END Line 165  END
  print $bodytag;   print $bodytag;
   
   my $identifier = $ENV{'QUERY_STRING'};    my $identifier = $ENV{'QUERY_STRING'};
   my $texfile = $ENV{'cgi.'.$identifier.'.file'};    my $texfile = $env{'cgi.'.$identifier.'.file'};
   my $laystyle = $ENV{'cgi.'.$identifier.'.layout'};    my $laystyle = $env{'cgi.'.$identifier.'.layout'};
   my $numberofcolumns = $ENV{'cgi.'.$identifier.'.numcol'};    my $numberofcolumns = $env{'cgi.'.$identifier.'.numcol'};
   my $paper = $ENV{'cgi.'.$identifier.'.paper'};    my $paper = $env{'cgi.'.$identifier.'.paper'};
   my $selectionmade = $ENV{'cgi.'.$identifier.'.selection'};    my $selectionmade = $env{'cgi.'.$identifier.'.selection'};
   my $tableofcontents = $ENV{'cgi.'.$identifier.'tableofcontents'};    my $tableofcontents = $env{'cgi.'.$identifier.'.tableofcontents'};
   my $tableofindex = $ENV{'cgi.'.$identifier.'tableofindex'};    my $tableofindex = $env{'cgi.'.$identifier.'.tableofindex'};
   my $advans_role = $ENV{'cgi.'.$identifier.'role'};    my $advanced_role = $env{'cgi.'.$identifier.'.role'};
   my $number_of_files = $ENV{'cgi.'.$identifier.'numberoffiles'}+1;    my $number_of_files = $env{'cgi.'.$identifier.'.numberoffiles'}+1;
   my $student_names = $ENV{'cgi.'.$identifier.'studentnames'};    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'};  
       
   my @names_pack=();    my @names_pack=();
   if ($student_names=~/_END_/) {      if ($student_names=~/_END_/) {  
       @names_pack=split(/_ENDPERSON_/,$student_names);        @names_pack=split(/_ENDPERSON_/,$student_names);
   }    }
   #got what we needed reset ENV in case it is to big for system  
   %ENV=%origENV;  
   
   my $figfile = $texfile;    my $figfile = $texfile;
   $figfile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.dat/;    $figfile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.dat/;
   my $duefile = $texfile;    my $duefile = $texfile;
   $duefile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.due/;    $duefile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.due/;
   #do we have figures?    #do we have figures?
     # print "Figure file: $figfile\n";
   if (-e $figfile) {    if (-e $figfile) {
         # print "$figfile exists\n";
       my %done_conversion;        my %done_conversion;
       my $temporary_file=IO::File->new($figfile) || die "Couldn't open fig file $figfile 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>;        my @content_of_file = <$temporary_file>;
       close $temporary_file;          close $temporary_file;  
       my $noteps;        my $noteps;
       my %prog_state;        my %prog_state;
       if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Coverting Images to EPS','Picture Conversion Status',$#content_of_file,'inline','80');  }        if ($advanced_role) { %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) {        foreach my $not_eps (@content_of_file) {
   chomp($not_eps);    chomp($not_eps);
   if ($not_eps ne '') {    if ($not_eps ne '') {
         # print "Converting $not_eps"; # Debugging.
               my $status_statement='EPS picture for '.$not_eps;                my $status_statement='EPS picture for '.$not_eps;
         # print "$status_statement\n";
       $not_eps=~s|\/\.\/|\/|g;        $not_eps=~s|\/\.\/|\/|g;
       my $eps_f = $not_eps;        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\//) {        if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) {
                   $eps_f=~s/\/home\/([^\/]+)\/public_html/$1/;                    $eps_f=~s/\/home\/([^\/]+)\/public_html/$1/;
   $eps_f = '/home/httpd/prtspool/'.$eps_f;    $eps_f = '/home/httpd/prtspool/'.$eps_f;
Line 109  END Line 218  END
   $eps_f=~/$Apache::lonnet::perlvar{'lonUsersDir'}\/([^\/]+)\/\w\/\w\/\w\/(.+)/;    $eps_f=~/$Apache::lonnet::perlvar{'lonUsersDir'}\/([^\/]+)\/\w\/\w\/\w\/(.+)/;
   $eps_f = '/home/httpd/prtspool/'.$1.'/'.$2;    $eps_f = '/home/httpd/prtspool/'.$1.'/'.$2;
       }        }
         $eps_f  =~ s/ /\_/g; # Spaces are problematic for system commands and LaTeX.
       my $path=$eps_f;        my $path=$eps_f;
       $path=~s/\/([^\/]+)\.eps$//;        $path =~ s/\/([^\/]+)\.eps$//;
         # print "Final file path: $path "; # Debugging
       File::Path::mkpath($path,0,0777);        File::Path::mkpath($path,0,0777);
       my $image = Image::Magick->new;  
       $not_eps =~ s/^\s+//;        $not_eps =~ s/^\s+//;
       $not_eps =~ s/\s+$//;        $not_eps =~ s/\s+$//;
       if ( exists($done_conversion{$not_eps})) {        $not_eps =~ s/ /\\ /g;
   next;        if ( exists($done_conversion{$not_eps})) { next; }
       }        if ($advanced_role) {
       if ($adv) {  
   my $prettyname=$not_eps;    my $prettyname=$not_eps;
   $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;    $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;
   $prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|;    $prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|;
   &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Converting to EPS '.$prettyname); }    &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Converting to EPS '.$prettyname);
         }
       $done_conversion{$not_eps}=1;        $done_conversion{$not_eps}=1;
       my $status = $image->Read($not_eps);        # print "Converting $not_eps -> $eps_f"; # Debugging
       if ($status) {print "  $status  ";}        system("convert $not_eps $eps_f");
       $image->Set(page => '+100+200');   
       $status = $image->Write($eps_f);      
       if ($status) {print "  $status  ";}  
               #check is eps exist in prtspool                #check is eps exist in prtspool
               if(not -e $eps_f) {                if(not -e $eps_f) {
   for (my $i=0;$i<10000;$i++) {    for (my $i=0;$i<10000;$i++) {
Line 140  END Line 247  END
       }          }  
   }    }
       }        }
       if ($adv) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }        if ($advanced_role) { 
     &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); 
         }
       unlink($figfile);        unlink($figfile);
   }    }
   #print "$texfile\n"; #name of the tex file for debugging only       #print "$texfile\n"; #name of the tex file for debugging only   
Line 149  END Line 258  END
       @texfile=();        @texfile=();
       for (my $i=1;$i<=$number_of_files;$i++) {        for (my $i=1;$i<=$number_of_files;$i++) {
   my $new_texfile=$texfile;    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;    push @texfile,$new_texfile;
       }         } 
   }    }
Line 157  END Line 267  END
 my $ind=-1;  my $ind=-1;
 my %prog_state;  my %prog_state;
 print "<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />";  print "<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />";
 if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); }  if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); }
 print "<br />";  print "<br />";
   my $num_files = @texfile;
 foreach $texfile (@texfile) {  foreach $texfile (@texfile) {
   my $status_statement='';    my $status_statement='';
   my $link_text='download PDF';    my $link_text='download PDF';
Line 166  foreach $texfile (@texfile) { Line 277  foreach $texfile (@texfile) {
   my @stud_info=split(/_END_/,$names_pack[$ind]);    my @stud_info=split(/_END_/,$names_pack[$ind]);
   my @tempo_array=split(/:/,$stud_info[0]);    my @tempo_array=split(/:/,$stud_info[0]);
   my $name;    my $name;
     my $name_range='';
   if ($tempo_array[3]) {    if ($tempo_array[3]) {
       $name=$tempo_array[3];        $name=$tempo_array[3];
         ($name_range) = split(/,/,$name, 2);
   } else {    } else {
       $name=$tempo_array[0].'@'.$tempo_array[1];        $name=$tempo_array[0].'@'.$tempo_array[1];
         $name_range = $tempo_array[0];
     }
     if (($name ne "") && ($name ne '@') ) { # Could be printing codes...
         $link_text='<b>'.$name.'</b>';
         $status_statement.=$name;
   }    }
   $link_text='<b>'.$name.'</b>';  
   $status_statement.=$name;  
   if ($#stud_info>0) {    if ($#stud_info>0) {
       @tempo_array=split(/:/,$stud_info[-1]);        @tempo_array=split(/:/,$stud_info[-1]);
       if ($tempo_array[3]) {        if ($tempo_array[3]) {
   $name=$tempo_array[3];    $name=$tempo_array[3];
     my ($lastname) = split(/,/, $name,2);
     $name_range .= "-".$lastname;
       } else {        } else {
   $name=$tempo_array[0].'@'.$tempo_array[1];    $name=$tempo_array[0].'@'.$tempo_array[1];
     $name_range .= '-'.$tempo_array[0];
         }
         if (($name ne "") && ($name ne '@')) {
     $link_text.=' - <b>'.$name.'</b>';
     $status_statement.=' -  '.$name;
     
       }        }
       $link_text.=' - <b>'.$name.'</b>';    }
       $status_statement.=' -  '.$name;    if(($num_files > 1) && ($link_text eq 'download PDF')) { # Printing codes
   }         $link_text = '<b>'.basename($texfile,'.tex').'.pdf</b>';
   if ($adv) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); }        $status_statement .= basename($texfile);
     }
     $name_range =~ s/'//g; # O'Neil -> ONeil e.g.
     print "<br/>";
     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 (-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/^(.*)\/([^\/]+)$/;         $texfile =~ m/^(.*)\/([^\/]+)$/; 
       my $name_file = $2;        my $name_file = $2;
       my $path_file = $1.'/';        my $path_file = $1.'/';
       chdir $path_file;        chdir $path_file;
       my $dvi_file= $name_file; $dvi_file =~ s/\.tex/\.dvi/;        my $dvi_file= $name_file; $dvi_file =~ s/\.tex/$name_range\.dvi/;
       &busy_wait_command("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 $status_statement now LaTeXing file",
  \%prog_state,$dvi_file);   \%prog_state,$dvi_file);
Line 218  foreach $texfile (@texfile) { Line 355  foreach $texfile (@texfile) {
       $temporary_file = IO::File->new('>'.$logfilename);         $temporary_file = IO::File->new('>'.$logfilename); 
       print $temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_log_file.'</pre></body></html>'."\n";        print $temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_log_file.'</pre></body></html>'."\n";
       if ($body_log_file=~m/!\s+Emergency stop/) {        if ($body_log_file=~m/!\s+Emergency stop/) {
   #LaTeX failed to parse tex file   
   print "<h2>LaTeX could not successfully parse your tex file.</h2>";  
   print "It probably has errors in it.<br />";  
   my $whereitbegins = rindex $body_log_file,'STAMPOFPASSEDRESOURCESTART';    my $whereitbegins = rindex $body_log_file,'STAMPOFPASSEDRESOURCESTART';
   my $whereitends = rindex $body_log_file,'STAMPOFPASSEDRESOURCEEND';    my $whereitends = rindex $body_log_file,'STAMPOFPASSEDRESOURCEEND';
     my $badresource;
     my $badtext;
   if ($whereitbegins!=-1 and $whereitends!=-1) {    if ($whereitbegins!=-1 and $whereitends!=-1) {
        print "With very high probability this error occured in ".substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26)."<br /><br />";        $badtext = substr($body_log_file,$whereitbegins+26, $whereitends-$whereitbegins-26);
   }        $whereitbegins  = rindex $badtext,'located in';
   print "Here are the error messages in the LaTeX log file</br><br />";        if ($whereitbegins != -1) {
   my $sygnal = 0;    
   for (my $i=0;$i<=$#content_of_file;$i++) {    $badresource = substr($badtext, $whereitbegins+27, 
       if ($content_of_file[$i]=~m/^Runaway argument?/ or $content_of_file[$i]=~m/^!/) {   length($badtext) - $whereitbegins - 48);
   $sygnal = 1;    # print "<br />failing resourcename: $badresource<br />";
       }         }
       if ($content_of_file[$i]=~m/Here is how much of/) {  
   $sygnal = 0;  
       }   
       if ($sygnal) {  
   print "$content_of_file[$i]<br />";  
       }    
   }    }
           if ($advans_role) {      
             if ($advanced_role) {  
         #LaTeX failed to parse tex file 
         print "<h2>LaTeX could not successfully parse your tex file.</h2>";
         print "It probably has errors in it.<br />";
         print "With very high probability this error occured in ".$badtext."<br /><br />";
         print "Here are the error messages in the LaTeX log file<br /><pre>";
   
         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 "</pre>\n";
         # print "<br /> Advanced role <br />";
               print "<b><big>The link to ";                print "<b><big>The link to ";
               $logfilename=~s/\/home\/httpd//;                $logfilename=~s/\/home\/httpd//;
       print "<a href=\"$logfilename\">Your log file </a></big></b>";        print "<a href=\"$logfilename\">Your log file </a></big></b>";
Line 257  foreach $texfile (@texfile) { Line 408  foreach $texfile (@texfile) {
       $texfile=~s/\/home\/httpd//;        $texfile=~s/\/home\/httpd//;
       print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";        print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";
       print "\n";        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 "<br />There are errors in $badtext";
         print "<br />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 "<br />A message has been sent to the instructor describing this failure<br />";
         my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", "Help on printing");
         print  ("$help_text");
   
   }    }
   
       } elsif ($body_log_file=~m/<inserted text>/) {        } elsif ($body_log_file=~m/<inserted text>/) {
Line 286  foreach $texfile (@texfile) { Line 455  foreach $texfile (@texfile) {
       my $ps_file = my $tempo_file = $1.'temporar.ps';        my $ps_file = my $tempo_file = $1.'temporar.ps';
       my $pdf_file = $1.'.pdf';        my $pdf_file = $1.'.pdf';
       if ($laystyle eq 'album' and $numberofcolumns eq '2') {        if ($laystyle eq 'album' and $numberofcolumns eq '2') {
   $comma = "psnup -2 -s1.0 $new_name_file";    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",    &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
      "for $status_statement now Modifying PS layout",       "for $status_statement now Modifying PS layout",
      \%prog_state,$tempo_file);        \%prog_state,$tempo_file); 
Line 318  foreach $texfile (@texfile) { Line 490  foreach $texfile (@texfile) {
 #  unlink @garb;  #  unlink @garb;
       unlink $duefile;        unlink $duefile;
       print "<a href=\"/prtspool/$pdf_file\">Your PDF document</a>";        print "<a href=\"/prtspool/$pdf_file\">Your PDF document</a>";
       if ($advans_role) {      }
   print "<br /><br />";    if ($advanced_role) {  
   print "<b><big>The link to ";        print "<br /><br />";
   $logfilename=~s/\/home\/httpd//;        print "<b><big>The link to ";
   print "<a href=\"$logfilename\">Your log file </a></big></b>";        $logfilename=~s/\/home\/httpd//;
   print "\n";        print "<a href=\"$logfilename\">Your log file </a></big></b>";
   #link tooriginal LaTeX file (included according Michael Hamlin desire)        print "\n";
   my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n";        #link tooriginal LaTeX file (included according Michael Hamlin desire)
   my @tex_content_of_file = <$tex_temporary_file>;        my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n";
   close $tex_temporary_file;         my @tex_content_of_file = <$tex_temporary_file>;
   my $body_tex_file = join(' ',@tex_content_of_file);        close $tex_temporary_file; 
   $texfile =~ s/\.tex$/aaaaa\.html/;        my $body_tex_file = join(' ',@tex_content_of_file);
   $tex_temporary_file = IO::File->new('>'.$texfile);         $texfile =~ s/\.tex$/aaaaa\.html/;
   print $tex_temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_tex_file.'</pre></body></html>'."\n";        $tex_temporary_file = IO::File->new('>'.$texfile); 
   print "<br /><br />";        print $tex_temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_tex_file.'</pre></body></html>'."\n";
   print "<b><big>The link to ";        print "<br /><br />";
   $texfile=~s/\/home\/httpd//;        print "<b><big>The link to ";
   print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";        $texfile=~s/\/home\/httpd//;
   print "\n";        print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";
       }        print "\n";
   }    }
       } else {        } else {
   #LaTeX successfully parsed tex file     #LaTeX successfully parsed tex file 
Line 356  foreach $texfile (@texfile) { Line 528  foreach $texfile (@texfile) {
       $new_name_file =~ m/^(.*)\./;        $new_name_file =~ m/^(.*)\./;
       my $ps_file = my $tempo_file = $1.'temporar.ps';        my $ps_file = my $tempo_file = $1.'temporar.ps';
       my $pdf_file = $1.'.pdf';        my $pdf_file = $1.'.pdf';
         $papera=~s/t/p/;
       if ($laystyle eq 'album' and $numberofcolumns eq '2') {        if ($laystyle eq 'album' and $numberofcolumns eq '2') {
   $comma = "psnup -2 -s1.0 $new_name_file";    $comma = "psnup $papera -2 -s1.0 $new_name_file";
   &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",    &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
      "for $status_statement now Modifying PS layout",       "for $status_statement now Modifying PS layout",
      \%prog_state,$tempo_file);       \%prog_state,$tempo_file);
       } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {        } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
   $papera=~s/t/p/;  
   $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"';    $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"';
   &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",    &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",
      "for $status_statement now Modifying PS layout",       "for $status_statement now Modifying PS layout",
Line 429  if ($number_of_files>1) { Line 601  if ($number_of_files>1) {
     $zipfile=~s/\/home\/httpd//;      $zipfile=~s/\/home\/httpd//;
     print "<br /> A <a href=\"$zipfile\">ZIP file</a> of all the PDFs.";      print "<br /> A <a href=\"$zipfile\">ZIP file</a> of all the PDFs.";
 }  }
 if ($adv) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }  if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
   
 my $done;  my $done;
 sub REAPER {  sub REAPER {
Line 442  sub busy_wait_command { Line 614  sub busy_wait_command {
     $SIG{CHLD} = \&REAPER;      $SIG{CHLD} = \&REAPER;
     $done=0;      $done=0;
     my $pid=open(CMD,"$command |");      my $pid=open(CMD,"$command |");
     if ($adv) {      if ($advanced_role) {
  &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message);   &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message);
     }      }
     while(!$done) {      while(!$done) {
Line 452  sub busy_wait_command { Line 624  sub busy_wait_command {
     my $size=(stat($output_file))[7];      my $size=(stat($output_file))[7];
     $extra_msg=", $size bytes generated";      $extra_msg=", $size bytes generated";
  }   }
  if ($adv) {   if ($advanced_role) {
     &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,      &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,
   $message.$extra_msg);    $message.$extra_msg);
  }   }
Removed from v.1.69  
changed lines
  Added in v.1.92

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>