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

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

version 1.90, 2005/09/12 10:16:52 version 1.98, 2006/04/24 21:30:06
Line 31  use File::Path; Line 31  use File::Path;
 use File::Basename;  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\./);
 }  }
   
 #  #
Line 112  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 />";
   
Line 121  sub send_error_mail { Line 116  sub send_error_mail {
     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 164  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 180  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 202  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 232  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 241  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;
         }
         my $anim_eps = $eps_f;
         $anim_eps =~ s/(\.[^.]*)\.eps$/$1-$i\.eps/i;
         if (-e $anim_eps) {
     rename($anim_eps, $eps_f);
   last;    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 271  END Line 289  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 />";  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;  my $num_files = @texfile;
 foreach $texfile (@texfile) {  foreach $texfile (@texfile) {
Line 316  foreach $texfile (@texfile) { Line 333  foreach $texfile (@texfile) {
   }    }
   $name_range =~ s/'//g; # O'Neil -> ONeil e.g.    $name_range =~ s/'//g; # O'Neil -> ONeil e.g.
   print "<br/>";    print "<br/>";
   if ($adv) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); }    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    #  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.    #  Tex filename from which they'll propagate into the other filenames as well.
   #    #
Line 337  foreach $texfile (@texfile) { Line 354  foreach $texfile (@texfile) {
  \%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 606  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 619  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 629  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.90  
changed lines
  Added in v.1.98

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