--- loncom/interface/printout.pl 2009/06/02 12:20:14 1.142 +++ loncom/interface/printout.pl 2010/08/26 08:32:58 1.146.4.1 @@ -1,7 +1,7 @@ #!/usr/bin/perl # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc. # -# $Id: printout.pl,v 1.142 2009/06/02 12:20:14 bisitz Exp $ +# $Id: printout.pl,v 1.146.4.1 2010/08/26 08:32:58 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -171,14 +171,24 @@ Your cookie information is incorrect. END - return; + exit; } my %perlvar=%{&LONCAPA::Configuration::read_conf('loncapa.conf')}; &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'}; @@ -468,16 +478,15 @@ foreach $texfile (@texfile) { my $pdf_file = $1.'.pdf'; $papera=~s/t/p/; if ($laystyle eq 'album' and $numberofcolumns eq '2') { - $comma = "fixps --force ".$new_name_file." | psnup $papera -2 -s1.0 "; + $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); } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') { - $comma = 'fixps --force '.$new_name_file.' | pstops '.$papera.' "2:0+1(0.48w,0)"'; + $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)" '.$new_name_file; &debug("PSTOPS 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); } else {