--- loncom/interface/printout.pl 2009/11/17 01:13:51 1.142.6.2 +++ loncom/interface/printout.pl 2011/03/04 16:53:06 1.146.4.2 @@ -1,7 +1,7 @@ #!/usr/bin/perl # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc. # -# $Id: printout.pl,v 1.142.6.2 2009/11/17 01:13:51 raeburn Exp $ +# $Id: printout.pl,v 1.146.4.2 2011/03/04 16:53:06 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -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,11 +477,6 @@ 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); if ($laystyle eq 'album' and $numberofcolumns eq '2') { $comma = "psnup $papera -2 -s1.0 $new_name_file"; &debug("PSNUP command: $comma"); @@ -899,8 +904,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, @@ -923,6 +928,12 @@ sub convert_figure { system("pdftops $not_eps $eps_f"); } 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 (not -e $eps_f) {