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

Diff for /loncom/interface/printout.pl between versions 1.143 and 1.146.4.2

version 1.143, 2009/07/03 16:13:13 version 1.146.4.2, 2011/03/04 16:53:06
Line 171  Your cookie information is incorrect. Line 171  Your cookie information is incorrect.
 </body>  </body>
 </html>  </html>
 END  END
     return;      exit;
 }  }
   
 my %perlvar=%{&LONCAPA::Configuration::read_conf('loncapa.conf')};  my %perlvar=%{&LONCAPA::Configuration::read_conf('loncapa.conf')};
Line 478  foreach $texfile (@texfile) { Line 478  foreach $texfile (@texfile) {
       my $pdf_file = $1.'.pdf';        my $pdf_file = $1.'.pdf';
       $papera=~s/t/p/;        $papera=~s/t/p/;
       if ($laystyle eq 'album' and $numberofcolumns eq '2') {        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");    &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",       "for $status_statement now Modifying PS layout",
      \%prog_state,$tempo_file);       \%prog_state,$tempo_file);
       } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {        } 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 ");    &debug("PSTOPS command: $comma ");
     &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
   &busy_wait_command("$comma 1>$tempo_file  2>/dev/null",  
      "for $status_statement now Modifying PS layout",       "for $status_statement now Modifying PS layout",
      \%prog_state,$tempo_file);        \%prog_state,$tempo_file); 
       } else {        } else {
Line 905  sub convert_figure { Line 904  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 929  sub convert_figure { Line 928  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.143  
changed lines
  Added in v.1.146.4.2

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