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

Diff for /loncom/interface/printout.pl between versions 1.55 and 1.74

version 1.55, 2004/05/06 06:45:13 version 1.74, 2005/03/15 11:19:28
Line 27 Line 27
 #  #
   
 use lib '/home/httpd/lib/perl';  use lib '/home/httpd/lib/perl';
 use Time::Local;  
 use LONCAPA::loncgi();  use LONCAPA::loncgi();
 use File::Path;  use File::Path;
 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 strict;
 $|=1;  $|=1;
 my %origENV=%ENV;  my %origENV=%ENV;
 if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {  if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {
Line 60  END Line 61  END
   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 $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 $advans_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 $adv = $ENV{'request.role.adv'};
       
Line 82  END Line 85  END
   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 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>;        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','75');  }        if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Coverting Images to EPS','Picture Conversion Status',$#content_of_file,'inline','80');  }
       foreach $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;
       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;
       } else {        } elsif ($eps_f=~/$Apache::lonnet::perlvar{'lonDocRoot'}\/res\//) {
   $eps_f=~m/\/home\/httpd\/html\/res\/(.+)/;    $eps_f=~m/$Apache::lonnet::perlvar{'lonDocRoot'}\/res\/(.+)/;
   $eps_f = '/home/httpd/prtspool/'.$1;    $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;        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 ($adv) {        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|/home/httpd/html/|/|;    $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;
       $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 135  END Line 143  END
       }          }  
   }    }
       }        }
       if ($adv) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }        if ($adv) { 
     &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 151  END Line 161  END
   
 my $ind=-1;  my $ind=-1;
 my %prog_state;  my %prog_state;
 if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','75'); }  print "<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />";
 my $final_statement="<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />Generated PDF File for:<br />";  if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); }
   print "<br />";
 foreach $texfile (@texfile) {  foreach $texfile (@texfile) {
   my $status_statement='';    my $status_statement='';
   my $link_text='download PDF';    my $link_text='download PDF';
Line 165  foreach $texfile (@texfile) { Line 176  foreach $texfile (@texfile) {
   } else {    } else {
       $name=$tempo_array[0].'@'.$tempo_array[1];        $name=$tempo_array[0].'@'.$tempo_array[1];
   }    }
   $link_text='<b>'.$name.'</b> ';    $link_text='<b>'.$name.'</b>';
   $status_statement.=$name;    $status_statement.=$name;
   if ($#stud_info>0) {    if ($#stud_info>0) {
       @tempo_array=split(/:/,$stud_info[-1]);        @tempo_array=split(/:/,$stud_info[-1]);
Line 174  foreach $texfile (@texfile) { Line 185  foreach $texfile (@texfile) {
       } else {        } else {
   $name=$tempo_array[0].'@'.$tempo_array[1];    $name=$tempo_array[0].'@'.$tempo_array[1];
       }        }
       $link_text.='- <b>'.$name.':</b>  ';        $link_text.=' - <b>'.$name.'</b>';
       $status_statement.=' -  '.$name;        $status_statement.=' -  '.$name;
   }     } 
   if ($adv) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); }    if ($adv) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); }
Line 183  foreach $texfile (@texfile) { Line 194  foreach $texfile (@texfile) {
       my $name_file = $2;        my $name_file = $2;
       my $path_file = $1.'/';        my $path_file = $1.'/';
       chdir $path_file;        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') {        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        } #to create table of contents
       my $idxname=$name_file;        my $idxname=$name_file;
       $idxname=~s/\.tex$/\.idx/;        $idxname=~s/\.tex$/\.idx/;
       if ($tableofindex eq 'yes') {        if ($tableofindex eq 'yes') {
   system("makeindex $idxname");    &busy_wait_command("makeindex $idxname",
   system("latex $name_file 1>/dev/null 2>/dev/null");       "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        } #to create index
       #Do we have a latex error in the log file?        #Do we have a latex error in the log file?
       my $logfilename = $texfile;        my $logfilename = $texfile; $logfilename =~ s/\.tex$/\.log/;
       $logfilename =~ s/\.tex$/\.log/;        my $temporary_file=IO::File->new($logfilename) || die "Couldn't open log file $logfilename for reading: $!\n";
       my $temporary_file=IO::File->new($logfilename) || die "Couldn't open file for reading: $!\n";  
       my @content_of_file = <$temporary_file>;        my @content_of_file = <$temporary_file>;
       close $temporary_file;         close $temporary_file; 
       my $body_log_file = join(' ',@content_of_file);        my $body_log_file = join(' ',@content_of_file);
Line 212  foreach $texfile (@texfile) { Line 231  foreach $texfile (@texfile) {
   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 />";         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 />";    print "Here are the error messages in the LaTeX log file</br><br /><pre>";
   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/^Runaway argument?/ or $content_of_file[$i]=~m/^!/) {        if ($content_of_file[$i]=~m/^Runaway argument?/ or $content_of_file[$i]=~m/^!/) {
Line 222  foreach $texfile (@texfile) { Line 241  foreach $texfile (@texfile) {
   $sygnal = 0;    $sygnal = 0;
       }         } 
       if ($sygnal) {        if ($sygnal) {
   print "$content_of_file[$i]<br />";    print "$content_of_file[$i]";
       }          }  
   }    }
     print "</pre>\n";
           if ($advans_role) {              if ($advans_role) {  
               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>";
       print "\n";        print "\n";
               #link tooriginal LaTeX file (included according Michael Hamlin desire)                #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>;        my @tex_content_of_file = <$tex_temporary_file>;
       close $tex_temporary_file;         close $tex_temporary_file; 
       my $body_tex_file = join(' ',@tex_content_of_file);        my $body_tex_file = join(' ',@tex_content_of_file);
Line 247  foreach $texfile (@texfile) { Line 267  foreach $texfile (@texfile) {
   
       } elsif ($body_log_file=~m/<inserted text>/) {        } elsif ($body_log_file=~m/<inserted text>/) {
   my $whereitbegins = index $body_log_file,'<inserted text>';    my $whereitbegins = index $body_log_file,'<inserted text>';
   print "You are running LaTeX in the <b>batch mode</b>.";    print "You are running LaTeX in <b>batch mode</b>.";
   while ($whereitbegins != -1) {    while ($whereitbegins != -1) {
       my $tempobegin=$whereitbegins;        my $tempobegin=$whereitbegins;
       $whereitbegins = rindex $body_log_file,'STAMPOFPASSEDRESOURCESTART',$whereitbegins;        $whereitbegins = rindex $body_log_file,'STAMPOFPASSEDRESOURCESTART',$whereitbegins;
Line 259  foreach $texfile (@texfile) { Line 279  foreach $texfile (@texfile) {
   $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 -Ppdf -G0 -o $new_name_file";    my $papera=$paper;
   system("$comma $name_file 1>/dev/null 2>/dev/null");    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) {    if (-e $new_name_file) {
       print "<h1>PDF output file (see link below)</h1>\n";        print "<h1>PDF output file (see link below)</h1>\n";
       $new_name_file =~ m/^(.*)\./;        $new_name_file =~ m/^(.*)\./;
       my $tempo_file = $1.'temporar.ps';        my $ps_file = my $tempo_file = $1.'temporar.ps';
       my $name_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";    $comma = "psnup -2 -s1.0 $new_name_file";
   system("$comma $tempo_file 1>/dev/null 2>/dev/null");     &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
   system("ps2pdf $tempo_file $name_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') {        } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
   $comma = 'pstops -pletter "2:0+1(0.48w,0)"';    my $papera=$paper;
   system("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null");                    if ($papera eq 'letter') {$papera='';}
   system("ps2pdf $tempo_file $name_file 1>/dev/null 2>/dev/null");    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 {        } 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 $texlog = $texfile;
       my $texaux = $texfile;        my $texaux = $texfile;
       my $texdvi = $texfile;        my $texdvi = $texfile;
Line 288  foreach $texfile (@texfile) { Line 323  foreach $texfile (@texfile) {
       my @garb = ($texaux,$texdvi,$texps);        my @garb = ($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/$pdf_file\">Your PDF document</a>";
       if ($advans_role) {          if ($advans_role) {  
   print "<br /><br />";    print "<br /><br />";
   print "<b><big>The link to ";    print "<b><big>The link to ";
Line 296  foreach $texfile (@texfile) { Line 331  foreach $texfile (@texfile) {
   print "<a href=\"$logfilename\">Your log file </a></big></b>";    print "<a href=\"$logfilename\">Your log file </a></big></b>";
   print "\n";    print "\n";
   #link tooriginal LaTeX file (included according Michael Hamlin desire)    #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>;    my @tex_content_of_file = <$tex_temporary_file>;
   close $tex_temporary_file;     close $tex_temporary_file; 
   my $body_tex_file = join(' ',@tex_content_of_file);    my $body_tex_file = join(' ',@tex_content_of_file);
Line 315  foreach $texfile (@texfile) { Line 350  foreach $texfile (@texfile) {
   $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 -Ppdf -G0 -o $new_name_file";    my $papera=$paper;
   system("$comma $name_file 1>/dev/null 2>/dev/null");    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) {    if (-e $new_name_file) {
       print "<br />$final_statement ";        print "<br />";
       $final_statement='';  
       $new_name_file =~ m/^(.*)\./;        $new_name_file =~ m/^(.*)\./;
       my $tempo_file = $1.'temporar.ps';        my $ps_file = my $tempo_file = $1.'temporar.ps';
       my $name_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";    $comma = "psnup -2 -s1.0 $new_name_file";
   system("$comma $tempo_file 1>/dev/null 2>/dev/null");     &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
   system("ps2pdf $tempo_file $name_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') {        } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
   $comma = 'pstops -pletter "2:0+1(0.48w,0)"';    $papera=~s/t/p/;
   system("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null");    $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"';
   system("ps2pdf $tempo_file $name_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",
        \%prog_state,$tempo_file); 
       } else {        } 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 (<FFH>) {
         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 $texlog = $texfile;
       my $texaux = $texfile;        my $texaux = $texfile;
       my $texdvi = $texfile;        my $texdvi = $texfile;
Line 345  foreach $texfile (@texfile) { Line 412  foreach $texfile (@texfile) {
       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\">$link_text</a>";        print "<a href=\"/prtspool/$pdf_file\">$link_text - click here to download pdf</a>";
       print "\n";        print "\n";
   }    }
       }        }  
   } else {    } else {
       print "LaTeX file $texfile was not created successfully";        print "LaTeX file $texfile was not created successfully";
   }    }
Line 370  if ($number_of_files>1) { Line 437  if ($number_of_files>1) {
 }  }
 if ($adv) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }  if ($adv) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
   
   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 ($adv) {
    &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 ($adv) {
       &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,
     $message.$extra_msg);
    }
       }
       $SIG{CHLD}='IGNORE';
       close(CMD);
   }
   
   
   
Removed from v.1.55  
changed lines
  Added in v.1.74

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