version 1.151, 2011/12/21 21:25:40
|
version 1.160, 2015/03/09 19:07:09
|
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 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 323 foreach $texfile (@texfile) {
|
Line 332 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 336 foreach $texfile (@texfile) {
|
Line 345 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]; |
} |
} |
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 572 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 598 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 614 sub busy_wait_command {
|
Line 644 sub busy_wait_command {
|
if ($size == $last_size) { |
if ($size == $last_size) { |
$unchanged_time++; |
$unchanged_time++; |
if ($timeout && ($unchanged_time > $timeout)) { |
if ($timeout && ($unchanged_time > $timeout)) { |
print "<h1>Operation timed out!</h1>\n"; |
print '<p class="LC_error">'.&mt('Operation timed out!')."</p>\n"; |
print "<p>Executing $command, the output file $output_file did not grow\n"; |
print "<p>Executing $command, the output file $output_file did not grow\n"; |
print "after $timeout seconds. This <em>may</em> indicate $command\n"; |
print "after $timeout seconds. This <em>may</em> indicate $command\n"; |
print "is in an infinite loop.\n"; |
print "is in an infinite loop.\n"; |
Line 903 sub convert_figure {
|
Line 933 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 947 sub convert_figure {
|
Line 977 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 1071 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 1129 sub analyze_logfile {
|
Line 1160 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; |
} |
} |
|
|