[BACK]Return to printout.pl CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/printout.pl between versions 1.142.6.2 and 1.147

version 1.142.6.2, 2009/11/17 01:13:51 version 1.147, 2011/02/08 12:53:39
Line 178  my %perlvar=%{&LONCAPA::Configuration::r Line 178  my %perlvar=%{&LONCAPA::Configuration::r
 &Apache::lonlocal::get_language_handle();  &Apache::lonlocal::get_language_handle();
 &Apache::loncommon::content_type(undef,'text/html');  &Apache::loncommon::content_type(undef,'text/html');
 $env{'request.noversionuri'} = '/cgi-bin/printout.pl';  $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 $identifier = $ENV{'QUERY_STRING'};
 my $texfile = $env{'cgi.'.$identifier.'.file'};  my $texfile = $env{'cgi.'.$identifier.'.file'};
Line 469  foreach $texfile (@texfile) { Line 479  foreach $texfile (@texfile) {
       $papera=~s/t/p/;        $papera=~s/t/p/;
               $comma = "fixps --force $new_name_file";                $comma = "fixps --force $new_name_file";
               &debug("FIXPS command: $comma");                &debug("FIXPS command: $comma");
               &busy_wait_command("$comma 1>/dev/null 2>/dev/null",                &busy_wait_command("$comma 1>$tempo_file  2>/dev/null",
                                  "for $status_statement now validating PS",                                   "for $status_statement now validating PS",
                                  \%prog_state,$tempo_file);                                   \%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') {        if ($laystyle eq 'album' and $numberofcolumns eq '2') {
   $comma = "psnup $papera -2 -s1.0 $new_name_file";    $comma = "psnup $papera -2 -s1.0 $new_name_file";
   &debug("PSNUP command: $comma");    &debug("PSNUP command: $comma");
Line 899  sub convert_figure { Line 911  sub convert_figure {
  $not_eps =~ s/^\s+//;   $not_eps =~ s/^\s+//;
  $not_eps =~ s/\s+$//;   $not_eps =~ s/\s+$//;
  $not_eps =~ s/ /\\ /g;   $not_eps =~ s/ /\\ /g;
       my $prettyname=$not_eps;
  if ($advanced_role) {   if ($advanced_role) {
     my $prettyname=$not_eps;  
     $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;      $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;
     $prettyname=~s|$perlvar{'lonDocRoot'}/|/|;      $prettyname=~s|$perlvar{'lonDocRoot'}/|/|;
     &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,      &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
Line 923  sub convert_figure { Line 935  sub convert_figure {
     system("pdftops $not_eps $eps_f");      system("pdftops $not_eps $eps_f");
  } else {   } else {
     system("convert $not_eps $eps_f");      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) {   if (not -e $eps_f) {
Removed from v.1.142.6.2  
changed lines
  Added in v.1.147

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>