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

Diff for /loncom/interface/printout.pl between versions 1.154 and 1.161

version 1.154, 2013/03/18 21:33:08 version 1.161, 2016/01/28 19:37:42
Line 209  if ($student_names=~/_END_/) { Line 209  if ($student_names=~/_END_/) {
     @names_pack=split(/_ENDPERSON_/,$student_names);      @names_pack=split(/_ENDPERSON_/,$student_names);
 }  }
 if ($backref) {  if ($backref) {
     print('<p>'.&mt("[_1]Return[_2] to editing resource.",      print('<p>'.&mt("[_1]Return[_2] to resource.",
     "<a href=\"$backref\"><b>","</b></a>").'</p>');      "<a href=\"$backref\"><b>","</b></a>").'</p>');
       print('<p><a href="javascript:gopost(\'/adm/printout\',\''.$backref.'\');">'.
           &mt("Change Printing Options").'</a></p>'."\n");
 }  }
 my $figfile = $texfile;  my $figfile = $texfile;
 $figfile =~ s/^(.*_printout)_\d+_\d+_\d+\.tex/$1\.dat/;  $figfile =~ s/^(.*_printout)_\d+_\d+_\d+\.tex/$1\.dat/;
Line 309  foreach $texfile (@texfile) { Line 311  foreach $texfile (@texfile) {
   my $name_range='';    my $name_range='';
   
   # $name       -> Either user's full name or username:domain    # $name       -> Either user's full name or username:domain
   # $name_range -> Either user's last name or usrname.    # $name_range -> Either user's last name or username.
   
   if ($tempo_array[3]) {    if ($tempo_array[3]) {
       $name=$tempo_array[3];        $name=$tempo_array[3];
       ($name_range) = split(/,/,$name, 2);        $name =~ s{^\s+|\s+$}{}g;
         if ($name =~ /,/) { 
             ($name_range) = split(/,/,$name, 2);
         } elsif ($name =~ /\s/) {
             $name_range = $name;
             $name_range =~ s/\s+/_/;
         } else {
             $name_range = $name;  
         }
         $name_range =~ s/[^\w\:\-]+//g;
   } else {    } else {
       $name=$tempo_array[0].':'.$tempo_array[1];        $name=$tempo_array[0].':'.$tempo_array[1];
       $name_range = $tempo_array[0];        $name_range = $tempo_array[0];
Line 336  foreach $texfile (@texfile) { Line 347  foreach $texfile (@texfile) {
       @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 =~ s{^\s+|\s+$}{}g;
             my $lastname;
             if ($name =~ /,/) {
         ($lastname) = split(/,/, $name,2);
             } elsif ($name =~ /\s/) {
                 $lastname = $name;
                 $lastname =~ s/\s+/_/;
             } else {
                 $lastname = $name;
             }
   $name_range .= "-".$lastname;    $name_range .= "-".$lastname;
             $name_range =~ s/[^\w\:\-]+//g;
       } else {        } else {
   $name=$tempo_array[0].':'.$tempo_array[1];    $name=$tempo_array[0].':'.$tempo_array[1];
   $name_range .= '-'.$tempo_array[0];    $name_range .= '-'.$tempo_array[0];
Line 914  sub convert_figure { Line 935  sub convert_figure {
   
     # Spaces are problematic for system commands and LaTeX, replace with _      # Spaces are problematic for system commands and LaTeX, replace with _
   
     $eps_f  =~ s/ /\_/g;       $eps_f  =~ s/ /\_/g;
   
     #       # 
     # If the file is already an .eps or .ps file (eps_f still has the original      # If the file is already an .eps or .ps file (eps_f still has the original
Line 958  sub convert_figure { Line 979  sub convert_figure {
  } else {   } else {
     system("convert $not_eps $eps_f");      system("convert $not_eps $eps_f");
         if($? and $advanced_role){          if($? and $advanced_role){
             print "<p class=\"LC_warning\">"              print '<p class="LC_warning">'
                   .mt("An error occured during the conversion of [_1].[_2]"                   .&mt('An error occurred during the conversion of [_1].',
                   ."If possible try to save this image using different settings and republish it.",                            '<span class="LC_filename">'.$prettyname.'</span>')
                   "<span class=\"LC_filename\">".$prettyname."</span>", "<br/>")                   .'<br />'
                   ."</p>";                   .&mt('If possible try to save this image using different settings and republish it.')
                    .'</p>';
         }          }
  }   }
   
Line 1051  sub analyze_logfile { Line 1073  sub analyze_logfile {
     print "<h2>".&mt('LaTeX could not successfully parse your TeX file.')."</h2>";      print "<h2>".&mt('LaTeX could not successfully parse your TeX file.')."</h2>";
     print &mt('It probably has errors in it.')."<br />";      print &mt('It probably has errors in it.')."<br />";
     if ($badtext) {      if ($badtext) {
                 print &mt('With very high probability this error occured in [_1].',$badtext)                  print &mt('With very high probability this error occurred in [_1].',$badtext)
                      ."<br /><br />";                       ."<br /><br />";
             }              }
     print &mt('Here are the error messages in the LaTeX log file:')      print &mt('Here are the error messages in the LaTeX log file:')
Line 1140  sub analyze_logfile { Line 1162  sub analyze_logfile {
     my $whereitends = index $body_log_file,'STAMPOFPASSEDRESOURCEEND',$whereitbegins;      my $whereitends = index $body_log_file,'STAMPOFPASSEDRESOURCEEND',$whereitbegins;
     print "<br />"      print "<br />"
                  .&mt('It has found an error in [_1][_2]and corrected it.',substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26),"<br />")."\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";      print &mt('Usually this correction is valid but you probably need to check the indicated resource one more time and implement necessary corrections by yourself.')."\n";
     $whereitbegins = index $body_log_file,'<inserted text>',$tempobegin+10;      $whereitbegins = index $body_log_file,'<inserted text>',$tempobegin+10;
  }   }
   
Removed from v.1.154  
changed lines
  Added in v.1.161

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