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

Diff for /loncom/interface/printout.pl between versions 1.135 and 1.136

version 1.135, 2008/03/26 09:50:21 version 1.136, 2008/08/07 16:43:18
Line 264  my $ind=-1; Line 264  my $ind=-1;
   
 my %prog_state;  my %prog_state;
 if ($advanced_role) {   if ($advanced_role) { 
     %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80');       %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status',&mt('Class Print Status'),$number_of_files,'inline','80'); 
 }  }
 print "<br />";  print "<br />";
 my $num_files = @texfile; # How does this differ from $number_of_files , can that be 0?  my $num_files = @texfile; # How does this differ from $number_of_files , can that be 0?
Line 594  sub busy_wait_command { Line 594  sub busy_wait_command {
 # various bits and pieces that control how the latex file is processed:  # various bits and pieces that control how the latex file is processed:
 # LaTeX is run as many times a needed to make this all happen... this may  # LaTeX is run as many times a needed to make this all happen... this may
 # result in several runs of LaTeX that just are errors if the LaTeX is  # result in several runs of LaTeX that just are errors if the LaTeX is
 # bad, butthe printing subsystem is _supposed_ to not do that.  # bad, but the printing subsystem is _supposed_ to not do that.
 #  #
 # Parameters:  # Parameters:
 #   name_file        - Name of the LaTeX file to process.  #   name_file        - Name of the LaTeX file to process.
Line 966  sub analyze_logfile { Line 966  sub analyze_logfile {
       length($badtext) - $whereitbegins - 48);        length($badtext) - $whereitbegins - 48);
  # print "<br />failing resourcename: $badresource<br />";   # print "<br />failing resourcename: $badresource<br />";
     }      }
  }          }
   
  # Guys with privileged roles get a more detailed error output:   # Guys with privileged roles get a more detailed error output:
   
  if ($advanced_role) {     if ($advanced_role) {  
     #LaTeX failed to parse tex file       #LaTeX failed to parse tex file 
     print "<h2>LaTeX could not successfully parse your tex file.</h2>";      print "<h2>".&mt('LaTeX could not successfully parse your tex file.')."</h2>";
     print "It probably has errors in it.<br />";      print &mt('It probably has errors in it.')."<br />";
     print "With very high probability this error occured in ".$badtext."<br /><br />";      if ($badtext) {
     print "Here are the error messages in the LaTeX log file<br /><pre>";                  print &mt('With very high probability this error occured in [_1].',$badtext)
                        ."<br /><br />";
               }
       print &mt('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++) {
Line 991  sub analyze_logfile { Line 995  sub analyze_logfile {
     }      }
     print "</pre>\n";      print "</pre>\n";
     # print "<br /> Advanced role <br />";      # print "<br /> Advanced role <br />";
     print "<b><big>The link to ";  
     $logfilename=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};      $logfilename=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
     print "<a href=\"$logfilename\">Your log file </a></big></b>";      print "<b><big>"
     print "\n";                   .&mt('The link to [_1]Your log file[_2]','<a href="'.$logfilename.'">','</a>')
            ."</big></b>\n";
     #link to original LaTeX file      #link to original LaTeX file
     my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile 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>;
Line 1004  sub analyze_logfile { Line 1008  sub analyze_logfile {
     $tex_temporary_file = IO::File->new('>'.$texfile);       $tex_temporary_file = IO::File->new('>'.$texfile); 
     print $tex_temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_tex_file.'</pre></body></html>'."\n";      print $tex_temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_tex_file.'</pre></body></html>'."\n";
     print "<br /><br />";      print "<br /><br />";
     print "<b><big>The link to ";  
     $texfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};      $texfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
     print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";      print "<b><big>"
     print "\n";                   .&mt('The link to [_1]Your original LaTeX file[_2]','<a href="'.$texfile.'">','</a>')
     my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", "Help on printing");           ."</big></b><br /><br />\n";
       my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", &mt('Help on printing'));
     print ("$help_text");      print ("$help_text");
   
     # Students on the other hand get a minimal error message, since they won't      # Students on the other hand get a minimal error message, since they won't
Line 1021  sub analyze_logfile { Line 1025  sub analyze_logfile {
     #    $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 />";
     print "<br />These errors prevent this resource from printing correctly";      if ($badtext) {
                   print &mt('There are errors in [_1].',$badtext);
               } else {
                   print &mt('There are errors.');
               }
       print "<br />".&mt('These errors prevent this resource from printing correctly.');
     my $tex_handle = IO::File->new($texfile);      my $tex_handle = IO::File->new($texfile);
     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 "<p>"
     my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", "Help on printing");                   .&mt('A message has been sent to the instructor describing this failure.')
                    ."</p>";
       my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", &mt('Help on printing'));
     print  ("$help_text");      print  ("$help_text");
           
   }    }
Line 1044  sub analyze_logfile { Line 1055  sub analyze_logfile {
   
     } 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 <b>batch mode</b>.";   print &mt('You are running LaTeX in [_1]batch mode[_2].','<b>','</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;
     my $whereitends = index $body_log_file,'STAMPOFPASSEDRESOURCEEND',$whereitbegins;      my $whereitends = index $body_log_file,'STAMPOFPASSEDRESOURCEEND',$whereitbegins;
     print "<br />It has found an error in".substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26)." <br /> and corrected it.\n";      print "<br />"
     print "Usually this correction is valid but you probably need to check the indicated resource one more time and implement neccessary corrections by yourself.\n";                   .&mt('It has found an error in [_1][_2]and corrected it.',substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26),"<br />")."\n";
       print &mt('Usually this correction is valid but you probably need to check the indicated resource one more time and implement neccessary corrections by yourself.')."\n";
     $whereitbegins = index $body_log_file,'<inserted text>',$tempobegin+10;      $whereitbegins = index $body_log_file,'<inserted text>',$tempobegin+10;
  }   }
   
  if ($advanced_role) {     if ($advanced_role) {  
     print "<br /><br />";      print "<br /><br />";
     print "<b><big>The link to ";  
     $logfilename=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};      $logfilename=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
     print "<a href=\"$logfilename\">Your log file </a></big></b>";      print "<b><big>"
     print "\n";                   .&mt('The link to [_1]Your log file[_2]'
                        ,'<a href="$logfilename">'.$logfilename.'</a>')
            ."</big></b>\n";
     #link to original LaTeX file      #link to original LaTeX file
     my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile 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>;
Line 1069  sub analyze_logfile { Line 1082  sub analyze_logfile {
     $tex_temporary_file = IO::File->new('>'.$texfile);       $tex_temporary_file = IO::File->new('>'.$texfile); 
     print $tex_temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_tex_file.'</pre></body></html>'."\n";      print $tex_temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_tex_file.'</pre></body></html>'."\n";
     print "<br /><br />";      print "<br /><br />";
     print "<b><big>The link to ";  
     $texfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};      $texfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
     print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";      print "<b><big>"
     print "\n";                    .&mt('The link to [_1]Your original LaTeX file[_2]','<a href="'.$texfile.'">','</a>');
       print "</big></b>\n";
  }   }
  return 1;   return 1;
     }      }
Removed from v.1.135  
changed lines
  Added in v.1.136

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