--- loncom/interface/printout.pl 2009/11/17 01:21:08 1.137.2.1
+++ loncom/interface/printout.pl 2014/02/06 21:28:09 1.157
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
#
-# $Id: printout.pl,v 1.137.2.1 2009/11/17 01:21:08 raeburn Exp $
+# $Id: printout.pl,v 1.157 2014/02/06 21:28:09 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,10 +44,15 @@ use LONCAPA::Configuration;
use strict;
my $busy_wait_timeout = 30;
+my $pdfs_converted = 0; # non zero if PDF includes (need to fixps).
+
+my $debugging = 0;
sub debug {
- my ($text) = @_;
- print "$text
\n";
+ if ($debugging) {
+ my ($text) = @_;
+ print "$text
\n";
+ }
}
# Determine if a user is operating as a student for this course/domain.
@@ -118,12 +123,12 @@ sub send_error_mail {
if (&is_student()) {
# build the subject and message body:
- # print "sending message to course coordinators.
";
+ &debug("sending message to course coordinators.");
# Todo: Convert badurl into a url from file path:
- my $subject = "Error [$badurl] Print failed for $user".'@'.$domain;
- my $message .= "Print failed to render LaTeX for $user".'@'."$domain\n";
+ my $subject = "Error [$badurl] Print failed for $user".':'.$domain;
+ my $message .= "Print failed to render LaTeX for $user".':'."$domain\n";
$message .= " User was attempting to print: \n";
foreach my $resource (split(/:/,$resources)) {
$message .= " $resource\n";
@@ -137,9 +142,9 @@ sub send_error_mail {
}
my (undef, %receivers) = &Apache::lonmsg::decide_receiver(undef, 0,
1,1,1);
- # print "
sending...section: $env{'request.course.sec'}";
+ &debug("sending...section: $env{'request.course.sec'}");
foreach my $dest (keys %receivers) {
- # print "
dest is $dest";
+ &debug("dest is $dest");
my @destinfo = split(/:/,$dest);
my $user = $destinfo[0];
my $dom = $destinfo[1];
@@ -173,7 +178,17 @@ my %perlvar=%{&LONCAPA::Configuration::r
&Apache::lonlocal::get_language_handle();
&Apache::loncommon::content_type(undef,'text/html');
$env{'request.noversionuri'} = '/cgi-bin/printout.pl';
-print(&Apache::loncommon::start_page('Creating PDF'));
+# Breadcrumbs
+#FIXME: Choose better/different breadcrumbs?!? Links?
+my $brcrum = [{'href' => '',
+ 'text' => 'Helper'}, #FIXME: Different origin possible than print out helper?
+ {'href' => '',
+ 'text' => 'Preparing Printout'},
+ {'href' => '',
+ 'text' => 'Creating PDF'}];
+print(&Apache::loncommon::start_page('Creating PDF',
+ undef,
+ {'bread_crumbs' => $brcrum,}));
my $identifier = $ENV{'QUERY_STRING'};
my $texfile = $env{'cgi.'.$identifier.'.file'};
@@ -211,18 +226,22 @@ $duefile =~ s/^(.*_printout)_\d+_\d+_\d+
# it contains the names of the files that need to be converted, one per line.
#
+&debug("Figure file is $figfile");
+
if (-e $figfile) {
- # print "$figfile exists\n";
+ &debug( "Figure file exists");
+ &debug("$figfile exists");
my %done_conversion;
my $temporary_file=IO::File->new($figfile) || die "Couldn't open fig file $figfile for reading: $!\n";
my @content_of_file = <$temporary_file>;
close $temporary_file;
my $noteps;
my %prog_state;
- if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Converting Images to EPS','Picture Conversion Status',$#content_of_file,'inline','80'); }
+ if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('',$#content_of_file); }
print('
');
foreach my $not_eps (@content_of_file) {
chomp($not_eps);
+ &debug( "Being asked to convert $not_eps");
if ($not_eps ne '') {
$not_eps=~s|\/\.\/|\/|g;
if (!$done_conversion{$not_eps}) { # Only convert multiple includes once.
@@ -264,7 +283,7 @@ my $ind=-1;
my %prog_state;
if ($advanced_role) {
- %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status',&mt('Class Print Status'),$number_of_files,'inline','80');
+ %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('',$number_of_files);
}
print "
";
my $num_files = @texfile; # How does this differ from $number_of_files , can that be 0?
@@ -289,14 +308,23 @@ foreach $texfile (@texfile) {
my $name;
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.
if ($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 {
- $name=$tempo_array[0].'@'.$tempo_array[1];
+ $name=$tempo_array[0].':'.$tempo_array[1];
$name_range = $tempo_array[0];
}
@@ -304,7 +332,7 @@ foreach $texfile (@texfile) {
# user is getting printed.
#
- if (($name ne "") && ($name ne '@') ) { # Could be printing codes...
+ if (($name ne "") && ($name ne ':') ) { # Could be printing codes...
$link_text=''.$name.'';
$status_statement.=$name;
}
@@ -317,13 +345,23 @@ foreach $texfile (@texfile) {
@tempo_array=split(/:/,$stud_info[-1]);
if ($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 =~ s/[^\w\:\-]+//g;
} 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 '@')) {
+ if (($name ne "") && ($name ne ':')) {
$link_text.=' - '.$name.'';
$status_statement.=' - '.$name;
@@ -353,7 +391,7 @@ foreach $texfile (@texfile) {
print "
";
if ($advanced_role) {
- &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement);
+ &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt('Creating PDF for: [_1]',$status_statement));
}
if (-e $texfile) { # Ensure the tex file exists:
@@ -403,7 +441,8 @@ foreach $texfile (@texfile) {
my $papera=$paper;
if ($papera eq 'letter') {$papera='';}
if ($papera ne '') {$papera='-t'.$papera;}
- my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file";
+ my $extra_ps_header = $perlvar{'lonLib'} .'/includepsheader.ps';
+ my $comma = "dvips $papera -h $extra_ps_header -Ppdf -G0 -o $new_name_file";
&busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
"for $status_statement now Converting to PS",
\%prog_state,$new_name_file);
@@ -457,14 +496,41 @@ foreach $texfile (@texfile) {
my $ps_file = my $tempo_file = $1.'temporar.ps';
my $pdf_file = $1.'.pdf';
$papera=~s/t/p/;
+#----
+# The code below uses fixps to make pdf include in sequences work.
+#
+# $comma = "fixps --force $new_name_file";
+# &debug("FIXPS command: $comma");
+# &busy_wait_command("$comma 1>$tempo_file 2>/dev/null",
+# "for $status_statement now validating PS",
+# \%prog_state,$tempo_file);
+
+#---
+# The code below uses gs to make pdf includes in sequences work
+
+ # Use gs to fix the postscript -> level 1.5
+ # .. if pdfs were included
+
+ if ($pdfs_converted > 0) {
+ $comma = "gs -sDEVICE=pswrite -dLanguageLevel=1.5 ";
+ &busy_wait_command("$comma -o $tempo_file $new_name_file 2>/dev/null 1>/dev/null",
+ "for $status_statement now validating PS",
+ \%prog_state, $tempo_file);
+
+#---
+ &busy_wait_command("mv $tempo_file $new_name_file",
+ 'File move', \%prog_state, $new_name_file);
+ }
if ($laystyle eq 'album' and $numberofcolumns eq '2') {
$comma = "psnup $papera -2 -s1.0 $new_name_file";
+ &debug("PSNUP command: $comma");
&busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
"for $status_statement now Modifying PS layout",
\%prog_state,$tempo_file);
} elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
- $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"';
- &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",
+ $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)" '.$new_name_file;
+ &debug("PSTOPS command: $comma ");
+ &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
"for $status_statement now Modifying PS layout",
\%prog_state,$tempo_file);
} else {
@@ -491,7 +557,7 @@ foreach $texfile (@texfile) {
close(FFHS);
$ps_file=$new_ps_file;
}
- &busy_wait_command("ps2pdf $ps_file $pdf_file 1>/dev/null 2>/dev/null",
+ &busy_wait_command("ps2pdf13 $ps_file $pdf_file 1>/dev/null 2>/dev/null",
"for $status_statement now Converting PS to PDF",
\%prog_state,$pdf_file);
@@ -506,14 +572,21 @@ foreach $texfile (@texfile) {
my @garb = ($texlog,$texaux,$texdvi,$texps);
# unlink @garb;
unlink($duefile);
- print "$link_text - click here to download pdf";
- print "\n";
+ print
+ '
' + .&mt('[_1] - [_2]Your PDF file[_3] is ready for download.', + $link_text,'','') + .'
'."\n"; } unlink($missfonts_file); } } else { - print "LaTeX file $texfile was not created successfully"; + print + '' + .&mt('The LaTeX file [_1] was not created successfully.', + ''.$texfile.'') + .'
'; } } print "Zip Output:\n"); + print('\n"); $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool}; - print "'.&mt('Zip Output:')."\n
\n"); system($statement); - print(""); + print("
' + .&mt('A [_1]ZIP file[_2] of all the PDF files is ready for download.', + '','') + .'
'; } if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); } print(&Apache::loncommon::end_page()); @@ -567,7 +644,7 @@ sub busy_wait_command { if ($size == $last_size) { $unchanged_time++; if ($timeout && ($unchanged_time > $timeout)) { - print "'.&mt('Operation timed out!')."
\n"; print "Executing $command, the output file $output_file did not grow\n";
print "after $timeout seconds. This may indicate $command\n";
print "is in an infinite loop.\n";
@@ -582,8 +659,7 @@ sub busy_wait_command {
}
}
if ($advanced_role) {
- &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,
- $message.$extra_msg);
+ &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message.$extra_msg);
}
}
$SIG{CHLD}='IGNORE';
@@ -680,8 +756,7 @@ sub repaginate {
my @pages_in_student; # For each student his/her initial page count.
my $max_pages = 0; # Pages in 'longest' student.
my $page_number = 0;
- &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
- &mt("Counting pages for student: [_1]",1));
+ &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Counting pages for student: [_1]",1));
while ($line = '
+ .&mt('An error occurred during the conversion of [_1].',
+ ''.$prettyname.'')
+ .' ';
if ($badtext) {
print &mt('There are errors in [_1].',$badtext);
} else {
print &mt('There are errors.');
}
- print "
'
+ .&mt('If possible try to save this image using different settings and republish it.')
+ .'".&mt('LaTeX could not successfully parse your tex file.')."
";
+ print "".&mt('LaTeX could not successfully parse your TeX file.')."
";
print &mt('It probably has errors in it.')."
";
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)
."
";
}
print &mt('Here are the error messages in the LaTeX log file:')
@@ -1025,13 +1121,15 @@ sub analyze_logfile {
# $name_file - is the name of the LaTeX file.
# $identifier - is the unique LaTeX identifier.l
- print "
";
+ print '
".&mt('These errors prevent this resource from printing correctly.');
+ print '