--- loncom/interface/printout.pl	2010/08/26 08:32:58	1.146.4.1
+++ loncom/interface/printout.pl	2012/04/11 11:40:14	1.152
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.146.4.1 2010/08/26 08:32:58 raeburn Exp $
+# $Id: printout.pl,v 1.152 2012/04/11 11:40:14 goltermann 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('<br />');
     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 "<br />";
 my $num_files = @texfile;	# How does this differ from $number_of_files , can that be 0?
@@ -372,7 +372,7 @@ foreach $texfile (@texfile) {
 
   print "<br/>";
   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:
@@ -477,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");
@@ -589,7 +614,7 @@ sub busy_wait_command {
 	    if ($size == $last_size) {
 		$unchanged_time++;
 		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 "after $timeout seconds.  This <em>may</em> indicate $command\n";
 		    print "is in an infinite loop.\n";
@@ -604,8 +629,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';
@@ -702,8 +726,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 = <PSFILE>) {
 	
@@ -731,8 +754,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;
 		}
@@ -744,8 +766,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;
     }
@@ -772,8 +793,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 = <LATEXIN>) {
 	if ($line eq "\\special{ps:ENDOFSTUDENTSTAMP}\n") {
@@ -790,8 +810,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;
@@ -872,8 +891,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'}\//) {
@@ -904,12 +923,10 @@ sub convert_figure {
 	$not_eps =~ s/^\s+//;
 	$not_eps =~ s/\s+$//;
 	$not_eps =~ s/ /\\ /g;
+    my $prettyname=$not_eps;
 	if ($advanced_role) {
-	    my $prettyname=$not_eps;
-	    $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.
@@ -926,8 +943,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 "<p class=\"LC_warning\">"
+                  .mt("An error occured during the conversion of [_1].[_2]"
+                  ."If possible try to save this image using different settings and republish it.",
+                  "<span class=\"LC_filename\">".$prettyname."</span>", "<br/>")
+                  ."</p>";
+        }
 	}
 
 	if (not -e $eps_f) {