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

Diff for /loncom/interface/printout.pl between versions 1.81 and 1.98

version 1.81, 2005/05/09 09:54:02 version 1.98, 2006/04/24 21:30:06
Line 28 Line 28
 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::lonnet;
 use Apache::loncommon;  use Apache::loncommon();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonmsg;  use Apache::lonmsg();
 use LONCAPA::Enrollment;  use LONCAPA::Enrollment;
   
 use strict;  use strict;
   
   
 #  
 #   Determine if a user is operating as a student for this course/domain.  #   Determine if a user is operating as a student for this course/domain.
 #  
 #  
 #Parameters:  #Parameters:
 #   course  - The course id.  #    none
 #   cdom    - The course domain.  
 #  
 #Implicit:  #Implicit:
 #    $env{request.role} contains the role under which this user operated this  #    $env{request.role} contains the role under which this user operated this
 #                       this request.  #                       this request.
 sub is_student {  sub is_student {
     return (! $env{'request.role.adv'});      return ($env{'request.role'}=~/^st\./);
 }  }
   
 #  #
 #   Debugging:  Dump the environment for debugging.  #   Debugging:  Dump the environment for debugging.
 #  #
 sub dumpenv  {  sub dumpenv  {
     print "<br>-------------------<br>";      print "<br />-------------------<br />";
     foreach my $key (sort (keys %env)) {      foreach my $key (sort (keys %env)) {
  print "<br>$key -> $env{$key}";   print "<br />$key -> $env{$key}";
     }      }
     print "<br>-------------------<br>";      print "<br />-------------------<br />";
 }  }
   
 #  #
Line 111  sub send_error_mail { Line 107  sub send_error_mail {
  #  The user is a student in the course:   #  The user is a student in the course:
  #   #
   
  if (&is_student( $courseid, $coursedom)) {   if (&is_student()) {
     # build the subject and message body:      # build the subject and message body:
     # print "sending message to course coordinators.<br>";      # print "sending message to course coordinators.<br />";
   
     # Todo: Convert badurl into a url from file path:      # Todo: Convert badurl into a url from file path:
   
     my $subject  = "Error [$badurl] Print failed for $user".'@'.$domain;      my $subject  = "Error [$badurl] Print failed for $user".'@'.$domain;
     my $message .= "Print failed to render LaTeX for $user".'@'."$domain\n";      my $message .= "Print failed to render LaTeX for $user".'@'."$domain\n";
     $message    .= "  User was attempting to print: \n";      $message    .= "  User was attempting to print: \n";
     $message    .= "       $resources\n";      foreach my $resource (split(/:/,$resources)) {
    $message    .= "       $resource\n";
       }
     $message    .= "--------------------LaTeX logfile:------------ \n";      $message    .= "--------------------LaTeX logfile:------------ \n";
     $message    .= $logfile;      $message    .= $logfile;
     $message    .= "-----------------LaTeX source file: ------------\n";      $message    .= "-----------------LaTeX source file: ------------\n";
Line 130  sub send_error_mail { Line 128  sub send_error_mail {
     }      }
     my (undef, %receivers) = &Apache::lonfeedback::decide_receiver(undef, 0,      my (undef, %receivers) = &Apache::lonfeedback::decide_receiver(undef, 0,
   1,1,1);    1,1,1);
     # print "<BR> sending...section:  $env{'request.course.sec'}";      # print "<br /> sending...section:  $env{'request.course.sec'}";
     foreach my $dest (keys %receivers) {      foreach my $dest (keys %receivers) {
  # print "<BR> dest is $dest";   # print "<br /> dest is $dest";
  my @destinfo = split(/:/,$dest);   my @destinfo = split(/:/,$dest);
  my $user = $destinfo[0];   my $user = $destinfo[0];
  my $dom  = $destinfo[1];   my $dom  = $destinfo[1];
Line 163  END Line 161  END
 }  }
  &Apache::lonlocal::get_language_handle();   &Apache::lonlocal::get_language_handle();
  &Apache::loncommon::content_type(undef,'text/html');   &Apache::loncommon::content_type(undef,'text/html');
  my $bodytag=&Apache::loncommon::bodytag('Creating PDF','','');   print(&Apache::loncommon::start_page('Creating PDF'));
  print $bodytag;  
   
   my $identifier = $ENV{'QUERY_STRING'};    my $identifier = $ENV{'QUERY_STRING'};
   my $texfile = $env{'cgi.'.$identifier.'.file'};    my $texfile = $env{'cgi.'.$identifier.'.file'};
Line 179  END Line 176  END
   my $student_names = $env{'cgi.'.$identifier.'.studentnames'};    my $student_names = $env{'cgi.'.$identifier.'.studentnames'};
   my $backref = &Apache::lonnet::unescape($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);
   }    }
   
   print "<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />";
   
   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 201  END Line 198  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','80');  }        if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Coverting Images to EPS','Picture Conversion Status',$#content_of_file,'inline','80');  }
         print('<br />');
       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 '') {
Line 210  END Line 208  END
       # print "$status_statement\n";        # 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 230  END Line 229  END
       $not_eps =~ s/\s+$//;        $not_eps =~ s/\s+$//;
       $not_eps =~ s/ /\\ /g;        $not_eps =~ s/ /\\ /g;
       if ( exists($done_conversion{$not_eps})) { next; }        if ( exists($done_conversion{$not_eps})) { next; }
       if ($adv) {        if ($advanced_role) {
   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'}/|/|;
Line 239  END Line 238  END
       $done_conversion{$not_eps}=1;        $done_conversion{$not_eps}=1;
       # print "Converting $not_eps -> $eps_f"; # Debugging        # print "Converting $not_eps -> $eps_f"; # Debugging
       system("convert $not_eps $eps_f");        system("convert $not_eps $eps_f");
               #check is eps exist in prtspool                # check is eps exist in prtspool
               if(not -e $eps_f) {                if (not -e $eps_f) {
     # converting an animated gif creates either:
                     # anim.gif.eps.0
                     # or
                     # anim.gif-0.eps
   for (my $i=0;$i<10000;$i++) {    for (my $i=0;$i<10000;$i++) {
       if (-e $eps_f.'.'.$i) {        if (-e $eps_f.'.'.$i) {
   rename $eps_f.'.'.$i, $eps_f;    rename($eps_f.'.'.$i, $eps_f);
   last;    last;
       }        }
         my $anim_eps = $eps_f;
         $anim_eps =~ s/(\.[^.]*)\.eps$/$1-$i\.eps/i;
         if (-e $anim_eps) {
     rename($anim_eps, $eps_f);
     last;
         }
     }
         }
         # imagemagick 6.2.0-6.2.7 fails to properly handle
                 # convert anim.gif anim.gif.eps
                 # it creates anim.eps instead. 
                 if (not -e $eps_f) {
     my $eps_f2 = $eps_f;
     $eps_f2 =~ s/\.[^.]*\.eps$/\.eps/i;
     if(-e $eps_f2) {
         rename($eps_f2,$eps_f);
   }    }
       }          }
   
   }    }
       }        }
       if ($adv) {         if ($advanced_role) { 
   &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state);     &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); 
       }        }
       unlink($figfile);        unlink($figfile);
Line 261  END Line 281  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;
       }         } 
   }    }
   
 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 />";  if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); }
 if ($adv) { %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 278  foreach $texfile (@texfile) { Line 299  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];
       }        }
       $link_text.=' - <b>'.$name.'</b>';        if (($name ne "") && ($name ne '@')) {
       $status_statement.=' -  '.$name;    $link_text.=' - <b>'.$name.'</b>';
   }     $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 = '<b>'.basename($texfile,'.tex').'.pdf</b>';
         $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);
       if ($tableofcontents eq 'yes') {        if ($tableofcontents eq 'yes') {
       &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 table of contents",   "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);   \%prog_state,$dvi_file);
       } #to create table of contents        } #to create table of contents
       my $idxname=$name_file;        my $idxname=$name_file;
Line 330  foreach $texfile (@texfile) { Line 380  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 $badresource;
     my $badtext;
   if ($whereitbegins!=-1 and $whereitends!=-1) {    if ($whereitbegins!=-1 and $whereitends!=-1) {
       my $badtext = substr($body_log_file,$whereitbegins+26, $whereitends-$whereitbegins-26);        $badtext = substr($body_log_file,$whereitbegins+26, $whereitends-$whereitbegins-26);
        print "With very high probability this error occured in ".$badtext."<br /><br />";  
       $whereitbegins  = rindex $badtext,'located in';        $whereitbegins  = rindex $badtext,'located in';
       if ($whereitbegins != -1) {        if ($whereitbegins != -1) {
       
   $badresource = substr($badtext, $whereitbegins+27,     $badresource = substr($badtext, $whereitbegins+27, 
  length($badtext) - $whereitbegins - 48);   length($badtext) - $whereitbegins - 48);
   # print "<BR>failing resourcename: $badresource<BR>";    # print "<br />failing resourcename: $badresource<br />";
       }        }
   }    }
   print "Here are the error messages in the LaTeX log file</br><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";  
           if ($advanced_role) {              if ($advanced_role) {  
       # print "<br> Advanced role <br>";        #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 380  foreach $texfile (@texfile) { Line 433  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...    } else { # Student role...
       #  at this point:        #  at this point:
       #    $body_log_file - contains the log file.        #    $body_log_file - contains the log file.
               #    $name_file     - is the name of the LaTeX file.                #    $name_file     - is the name of the LaTeX file.
               #    $identifier    - is the unique LaTeX identifier.l                #    $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_handle = IO::File->new($name_file);
       my @tex_contents = <$tex_handle>;        my @tex_contents = <$tex_handle>;
       &send_error_mail($identifier, $badresource, $body_log_file, \@tex_contents);        &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 418  foreach $texfile (@texfile) { Line 480  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 488  foreach $texfile (@texfile) { Line 553  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 561  if ($number_of_files>1) { Line 626  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); }
   print(&Apache::loncommon::end_page());
 my $done;  my $done;
 sub REAPER {  sub REAPER {
     $done=1;      $done=1;
Line 574  sub busy_wait_command { Line 639  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 584  sub busy_wait_command { Line 649  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.81  
changed lines
  Added in v.1.98

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