Diff for /loncom/interface/printout.pl between versions 1.18 and 1.23

version 1.18, 2002/08/14 20:38:52 version 1.23, 2003/04/01 04:30:11
Line 3  use IO::File; Line 3  use IO::File;
 use Image::Magick;  use Image::Magick;
  print "Content-type: text/html\n\n";   print "Content-type: text/html\n\n";
  print "<body bgcolor=\"#FFFFFF\">\n";   print "<body bgcolor=\"#FFFFFF\">\n";
   my ($texfile,$laystyle,$numberofcolumns) = split(/&/,$ENV{'QUERY_STRING'});    my ($texfile,$laystyle,$numberofcolumns,$selectionmade) = split(/&/,$ENV{'QUERY_STRING'});
   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;
Line 29  use Image::Magick; Line 29  use Image::Magick;
       $image->Set(page => '+100+200');         $image->Set(page => '+100+200'); 
       $status = $image->Write($eps_f);            $status = $image->Write($eps_f);    
       if ($status) {print "  $status  ";}        if ($status) {print "  $status  ";}
                 #check is eps exist in prtspool
                 if(not -e $eps_f) {
     for (my $i=0;$i<10000;$i++) {
         if (-e $eps_f.'.'.$i) {
     rename $eps_f.'.'.$i, $eps_f;
     last;
         }
     }
         }  
   }    }
       }        }
       unlink $figfile;        unlink $figfile;
Line 48  use Image::Magick; Line 57  use Image::Magick;
   my $body_log_file = join(' ',@content_of_file);     my $body_log_file = join(' ',@content_of_file); 
   if ($body_log_file=~m/!\s+Emergency stop/) {    if ($body_log_file=~m/!\s+Emergency stop/) {
       #LaTeX failed to parse tex file         #LaTeX failed to parse tex file 
       print "<h1>LaTeX could not successfully parse your tex file.</h1>";        print "<h2>LaTeX could not successfully parse your tex file.</h2>";
       print "<h2>It probably has errors in it.</h2>";        print "It probably has errors in it.<br />";
       print "Here are the error messages in the LaTeX log file</br>";        my $whereitbegins = rindex $body_log_file,'STAMPOFPASSEDRESOURCESTART';
         my $whereitends = rindex $body_log_file,'STAMPOFPASSEDRESOURCEEND';
         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 />";
         }
         print "Here are the error messages in the LaTeX log file</br><br />";
       my $sygnal = 0;        my $sygnal = 0;
       for (my $i=0;$i<=$#content_of_file;$i++) {        for (my $i=0;$i<=$#content_of_file;$i++) {
   if ($content_of_file[$i]=~m/^!/) {            if ($content_of_file[$i]=~m/^Runaway argument?/ or $content_of_file[$i]=~m/^!/) {
       $sygnal = 1;        $sygnal = 1;
   }     } 
   if ($content_of_file[$i]=~m/Here is how much of/) {    if ($content_of_file[$i]=~m/Here is how much of/) {
Line 68  use Image::Magick; Line 82  use Image::Magick;
       $name_file =~ s/\.tex/\.dvi/;        $name_file =~ s/\.tex/\.dvi/;
       my $new_name_file = $name_file;        my $new_name_file = $name_file;
       $new_name_file =~ s/\.dvi/\.ps/;        $new_name_file =~ s/\.dvi/\.ps/;
       my $comma = "dvips -o $new_name_file";        my $comma = "dvips -Ppdf -G0 -o $new_name_file";
       system("$comma $name_file");        system("$comma $name_file");
       if (-e $new_name_file) {        if (-e $new_name_file) {
   print "<h1>OUTPUT is in the PDF FILE (see link below)</h1>\n";    print "<h1>OUTPUT is in the PDF FILE (see link below)</h1>\n";
   $new_name_file =~ m/^(.*)\./;    $new_name_file =~ m/^(.*)\./;
   my $tempo_file = $1.'temporar.ps';    my $tempo_file = $1.'temporar.ps';
   my $name_file = $1.'.pdf';    my $name_file = $1.'.pdf';
   if ($laystyle eq 'album') {    if ($laystyle eq 'album' and $numberofcolumns eq '2') {
       $comma = "psnup -2 -s1.0 $new_name_file";        $comma = "psnup -2 -s1.0 $new_name_file";
       system("$comma $tempo_file");         system("$comma $tempo_file"); 
       system("ps2pdf $tempo_file $name_file");        system("ps2pdf $tempo_file $name_file");
   } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {    } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
       $comma = 'pstops "2:0+1(0.5w,0)"';        $comma = 'pstops -pletter "2:0+1(0.48w,0)"';
       system("$comma $new_name_file $tempo_file");        system("$comma $new_name_file $tempo_file");
       system("ps2pdf $tempo_file $name_file");        system("ps2pdf $tempo_file $name_file");
   } else {    } else {
Line 95  use Image::Magick; Line 109  use Image::Magick;
   $texdvi =~ s/\.tex/\.dvi/;    $texdvi =~ s/\.tex/\.dvi/;
   $texps =~ s/\.tex/\.ps/;    $texps =~ s/\.tex/\.ps/;
   my @garb = ($texlog,$texaux,$texdvi,$texps);    my @garb = ($texlog,$texaux,$texdvi,$texps);
   #unlink @garb;  #  unlink @garb;
   unlink $duefile;    unlink $duefile;
   print "<a href=\"/prtspool/$name_file\">Your PDF document</a>";    print "<a href=\"/prtspool/$name_file\">Your PDF document</a>";
   print "\n";    print "\n";

Removed from v.1.18  
changed lines
  Added in v.1.23


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