--- loncom/interface/printout.pl 2014/02/13 17:47:30 1.146.4.3 +++ loncom/interface/printout.pl 2013/03/18 21:33:08 1.154 @@ -1,7 +1,7 @@ #!/usr/bin/perl # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc. # -# $Id: printout.pl,v 1.146.4.3 2014/02/13 17:47:30 raeburn Exp $ +# $Id: printout.pl,v 1.154 2013/03/18 21:33:08 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,7 +44,7 @@ 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; @@ -237,7 +237,7 @@ if (-e $figfile) { 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); @@ -283,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? @@ -309,20 +309,11 @@ foreach $texfile (@texfile) { my $name_range=''; # $name -> Either user's full name or username:domain - # $name_range -> Either user's last name or username. + # $name_range -> Either user's last name or usrname. if ($tempo_array[3]) { $name=$tempo_array[3]; - $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; + ($name_range) = split(/,/,$name, 2); } else { $name=$tempo_array[0].':'.$tempo_array[1]; $name_range = $tempo_array[0]; @@ -345,18 +336,8 @@ foreach $texfile (@texfile) { @tempo_array=split(/:/,$stud_info[-1]); if ($tempo_array[3]) { $name=$tempo_array[3]; - $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; + my ($lastname) = split(/,/, $name,2); + $name_range .= "-".$lastname; } else { $name=$tempo_array[0].':'.$tempo_array[1]; $name_range .= '-'.$tempo_array[0]; @@ -391,7 +372,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: @@ -496,6 +477,31 @@ 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"); @@ -547,14 +553,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 "
"; @@ -566,11 +579,15 @@ if ($number_of_files>1) { $file=~s/\.tex/.\pdf/; $statement.=' '.$file; } - print("
Zip Output:\n");
+    print('
'.&mt('Zip Output:')."\n
\n");
     system($statement);
-    print("
");
+    print("

\n"); $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool}; - print "
A ZIP file of all the PDFs."; + 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()); @@ -608,7 +625,7 @@ sub busy_wait_command { if ($size == $last_size) { $unchanged_time++; if ($timeout && ($unchanged_time > $timeout)) { - print "

Operation timed out!

\n"; + 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"; @@ -623,8 +640,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'; @@ -721,8 +737,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 = ) { @@ -750,8 +765,7 @@ sub repaginate { # - save the page_number, reset and, if necessary # update max_pages. push(@pages_in_student, $page_number); - &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, - &mt("Counting pages for student: [_1]", scalar(@pages_in_student))); + &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Counting pages for student: [_1]", scalar(@pages_in_student))); if ($page_number > $max_pages) { $max_pages = $page_number; } @@ -763,8 +777,7 @@ sub repaginate { } # file ended so one more student push(@pages_in_student, $page_number); - &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, - &mt("Counting pages for student: [_1]",scalar(@pages_in_student))); + &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Counting pages for student: [_1]",scalar(@pages_in_student))); if ($page_number > $max_pages) { $max_pages = $page_number; } @@ -791,8 +804,7 @@ sub repaginate { my $student_number = 0; # Index of student we're working on. - &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, - "Repaginating student ".$student_number+1); + &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Repaginating student: [_1]",$student_number+1)); while (my $line = ) { if ($line eq "\\special{ps:ENDOFSTUDENTSTAMP}\n") { @@ -809,8 +821,7 @@ sub repaginate { } $student_number++; - &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, - "Repaginating student ".$student_number+1); + &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Repaginating student: [_1]",$student_number+1)); } else { print LATEXOUT $line; @@ -891,8 +902,8 @@ sub convert_figure { my $status_statement='EPS picture for '.$not_eps; my $eps_f = $not_eps; - if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) { - $eps_f=~s/\/home\/([^\/]+)\/public_html/$1/; + if ($eps_f=~/\/home\/httpd\/html\/priv\/[^\/]+\/([^\/]+)\//) { + $eps_f=~s/\/home\/httpd\/html\/priv\/[^\/]+\/([^\/]+)/$1/; } elsif ($eps_f=~/$perlvar{'lonDocRoot'}\/res\//) { $eps_f=~ s/$perlvar{'lonDocRoot'}\/res\/(.+)/$1/; } elsif ($eps_f=~/$perlvar{'lonUsersDir'}\//) { @@ -923,12 +934,10 @@ sub convert_figure { $not_eps =~ s/^\s+//; $not_eps =~ s/\s+$//; $not_eps =~ s/ /\\ /g; - my $prettyname=$not_eps; + my $prettyname=$not_eps; if ($advanced_role) { - $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|; $prettyname=~s|$perlvar{'lonDocRoot'}/|/|; - &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, - 'Converting to EPS '.$prettyname); + &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt('Converting to EPS: [_1]',$prettyname)); } # # If the file is a PDF, need to use pdftops to convert it to a ps file. @@ -945,14 +954,16 @@ sub convert_figure { &debug("Converting pdf $not_eps to postscript: $eps_f"); system("pdftops $not_eps $eps_f"); + $pdfs_converted++; # Need to fix ps in last pass. } else { system("convert $not_eps $eps_f"); - if ($? and $advanced_role) { - print '

' - .&mt('An error occured during the conversion of [_1].[_2]If possible try to save this image using different settings and republish it.', - ''.$prettyname.'','
') - .'

'; - } + if($? and $advanced_role){ + print "

" + .mt("An error occured during the conversion of [_1].[_2]" + ."If possible try to save this image using different settings and republish it.", + "".$prettyname."", "
") + ."

"; + } } if (not -e $eps_f) {