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

Diff for /loncom/interface/printout.pl between versions 1.58 and 1.59

version 1.58, 2004/05/12 18:44:50 version 1.59, 2004/07/28 22:00:14
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;
Line 36  use Apache::lonhtmlcommon; Line 35  use Apache::lonhtmlcommon;
 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 89  END Line 89  END
       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 '') {
               my $status_statement='EPS picture for '.$not_eps;                my $status_statement='EPS picture for '.$not_eps;
Line 122  END Line 122  END
   $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;
       $status = $image->Read($not_eps);        my $status = $image->Read($not_eps);
       if ($status) {print "  $status  ";}        if ($status) {print "  $status  ";}
       $image->Set(page => '+100+200');         $image->Set(page => '+100+200'); 
       $status = $image->Write($eps_f);            $status = $image->Write($eps_f);    
Line 154  END Line 154  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'); }  if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); }
 my $final_statement="<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />Generated PDF File for:<br />";  my $final_statement="<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />Generated PDF File for:<br />";
 foreach $texfile (@texfile) {  foreach $texfile (@texfile) {
   my $status_statement='';    my $status_statement='';
Line 186  foreach $texfile (@texfile) { Line 186  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");    system("latex $name_file 1>/dev/null 2>/dev/null");
       } #to create table of contents        } #to create table of contents
Line 250  foreach $texfile (@texfile) { Line 253  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 263  foreach $texfile (@texfile) { Line 266  foreach $texfile (@texfile) {
   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 $comma = "dvips -Ppdf -G0 -o $new_name_file";
   system("$comma $name_file 1>/dev/null 2>/dev/null");    &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)"';    $comma = 'pstops -pletter "2:0+1(0.48w,0)"';
   system("$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",
   system("ps2pdf $tempo_file $name_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 291  foreach $texfile (@texfile) { Line 302  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 319  foreach $texfile (@texfile) { Line 330  foreach $texfile (@texfile) {
   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 $comma = "dvips -Ppdf -G0 -o $new_name_file";
   system("$comma $name_file 1>/dev/null 2>/dev/null");    &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 ";
       $final_statement='';        $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)"';    $comma = 'pstops -pletter "2:0+1(0.48w,0)"';
   system("$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",
   system("ps2pdf $tempo_file $name_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 348  foreach $texfile (@texfile) { Line 367  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</a>";
       print "\n";        print "\n";
   }    }
       }        }
Line 373  if ($number_of_files>1) { Line 392  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 |");
       &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";
    }
    &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,
         $message.$extra_msg);
       }
       $SIG{CHLD}='IGNORE';
       close(CMD);
   }
   
   
   
Removed from v.1.58  
changed lines
  Added in v.1.59

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