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

Diff for /loncom/interface/printout.pl between versions 1.152 and 1.156

version 1.152, 2012/04/11 11:40:14 version 1.156, 2013/08/14 00:26:29
Line 127  sub send_error_mail { Line 127  sub send_error_mail {
   
     # 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";
     foreach my $resource (split(/:/,$resources)) {      foreach my $resource (split(/:/,$resources)) {
  $message    .= "       $resource\n";   $message    .= "       $resource\n";
Line 308  foreach $texfile (@texfile) { Line 308  foreach $texfile (@texfile) {
   my $name;    my $name;
   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 usrname.
   
   if ($tempo_array[3]) {    if ($tempo_array[3]) {
       $name=$tempo_array[3];        $name=$tempo_array[3];
       ($name_range) = split(/,/,$name, 2);        ($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];        $name_range = $tempo_array[0];
   }    }
   
Line 323  foreach $texfile (@texfile) { Line 323  foreach $texfile (@texfile) {
   # user is getting printed.    # user is getting printed.
   #    #
   
   if (($name ne "") && ($name ne '@') ) { # Could be printing codes...    if (($name ne "") && ($name ne ':') ) { # Could be printing codes...
       $link_text='<b>'.$name.'</b>';        $link_text='<b>'.$name.'</b>';
       $status_statement.=$name;        $status_statement.=$name;
   }    }
Line 339  foreach $texfile (@texfile) { Line 339  foreach $texfile (@texfile) {
   my ($lastname) = split(/,/, $name,2);    my ($lastname) = split(/,/, $name,2);
   $name_range .= "-".$lastname;    $name_range .= "-".$lastname;
       } 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];
       }        }
       if (($name ne "") && ($name ne '@')) {        if (($name ne "") && ($name ne ':')) {
   $link_text.=' - <b>'.$name.'</b>';    $link_text.=' - <b>'.$name.'</b>';
   $status_statement.=' -  '.$name;    $status_statement.=' -  '.$name;
       
Line 553  foreach $texfile (@texfile) { Line 553  foreach $texfile (@texfile) {
       my @garb = ($texlog,$texaux,$texdvi,$texps);        my @garb = ($texlog,$texaux,$texdvi,$texps);
 #  unlink @garb;  #  unlink @garb;
       unlink($duefile);        unlink($duefile);
       print "<a href=\"/prtspool/$pdf_file\">$link_text - click here to download pdf</a>";        print
       print "\n";                    '<p>'
                    .&mt('[_1] - [_2]Your PDF file[_3] is ready for download.',
                         $link_text,'<a href="/prtspool/'.$pdf_file.'">','</a>')
                    .'</p>'."\n";
   }    }
   unlink($missfonts_file);    unlink($missfonts_file);
   
       }          }  
   } else {    } else {
       print "LaTeX file $texfile was not created successfully";        print
             '<p class="LC_error">'
            .&mt('The LaTeX file [_1] was not created successfully.',
                 '<span class="LC_filename">'.$texfile.'</span>')
            .'</p>';
   }    }
 }  }
 print "<br />";  print "<br />";
Line 572  if ($number_of_files>1) { Line 579  if ($number_of_files>1) {
  $file=~s/\.tex/.\pdf/;   $file=~s/\.tex/.\pdf/;
  $statement.=' '.$file;    $statement.=' '.$file; 
     }      }
     print("<pre>Zip Output:\n");      print('<p>'.&mt('Zip Output:')."\n<pre>\n");
     system($statement);      system($statement);
     print("</pre>");      print("</pre></p>\n");
     $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};      $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
     print "<br /> A <a href=\"$zipfile\">ZIP file</a> of all the PDFs.";      print
           '<p>'
          .&mt('A [_1]ZIP file[_2] of all the PDF files is ready for download.',
               '<a href="'.$zipfile.'">','</a>')
          .'</p>';
 }  }
 if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }  if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
 print(&Apache::loncommon::end_page());  print(&Apache::loncommon::end_page());
Line 947  sub convert_figure { Line 958  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 1040  sub analyze_logfile { Line 1052  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:')
Removed from v.1.152  
changed lines
  Added in v.1.156

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