--- loncom/interface/printout.pl	2010/05/11 12:10:25	1.142.6.3
+++ loncom/interface/printout.pl	2011/10/26 02:09:42	1.150
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.142.6.3 2010/05/11 12:10:25 raeburn Exp $
+# $Id: printout.pl,v 1.150 2011/10/26 02:09:42 www 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;
 
@@ -178,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'};
@@ -467,19 +477,37 @@ foreach $texfile (@texfile) {
 	      my $ps_file = my $tempo_file = $1.'temporar.ps';
 	      my $pdf_file = $1.'.pdf';
 	      $papera=~s/t/p/;
-              $comma = "fixps --force $new_name_file";
-              &debug("FIXPS command: $comma");
-              &busy_wait_command("$comma 1>/dev/null 2>/dev/null",
-                                 "for $status_statement now validating PS",
-                                 \%prog_state,$tempo_file);
+#----
+# 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 1>$tempo_file 2>/dev/null",
+		  &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
 				     "for $status_statement now Modifying PS layout",
 				     \%prog_state,$tempo_file);
-	          &busy_wait_command("mv $tempo_file $new_name_file",
-				     'File move', \%prog_state, $new_name_file);
 	      } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
 		  $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)" '.$new_name_file;
 		  &debug("PSTOPS command: $comma ");
@@ -869,8 +897,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'}\//) {
@@ -901,9 +929,8 @@ 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);
@@ -923,8 +950,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) {