Diff for /loncom/interface/printout.pl between versions 1.84 and 1.91

version 1.84, 2005/07/05 13:31:27 version 1.91, 2005/09/16 19:36:08
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;
Line 120  sub send_error_mail { Line 121  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 210  END Line 213  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 261  END Line 265  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;
       }         } 
   }    }
Line 271  my %prog_state; Line 276  my %prog_state;
 print "<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />";  print "<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />";
 if ($adv) { %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 284  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(($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 ($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); }
     #  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);
Line 351  foreach $texfile (@texfile) { Line 383  foreach $texfile (@texfile) {
       print "It probably has errors in it.<br />";        print "It probably has errors in it.<br />";
       print "With very high probability this error occured in ".$badtext."<br /><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>";        print "Here are the error messages in the LaTeX log file<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 382  foreach $texfile (@texfile) { Line 415  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.
Line 393  foreach $texfile (@texfile) { Line 429  foreach $texfile (@texfile) {
       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 />"        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>/) {

Removed from v.1.84  
changed lines
  Added in v.1.91


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