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

Diff for /loncom/interface/printout.pl between versions 1.164 and 1.177

version 1.164, 2017/01/29 23:53:55 version 1.177, 2024/11/09 16:08:15
Line 41  use Apache::lonmsg(); Line 41  use Apache::lonmsg();
 use LONCAPA::Enrollment;  use LONCAPA::Enrollment;
 use LONCAPA::Configuration;  use LONCAPA::Configuration;
 use LONCAPA;  use LONCAPA;
   use Archive::Zip qw( :ERROR_CODES );
   
 use strict;  use strict;
   
Line 160  sub send_error_mail { Line 161  sub send_error_mail {
     }      }
 }  }
   
   sub get_pstops_offsets {
       my ($paper) = @_;
       my ($origwidth,$origheight,$origunits,$ptype,$xoff,$yoffl,$yoffr);
       $ptype = "-p$paper";
       if ($paper eq 'letter') {
           $origwidth = 11.0;
           $origheight = 8.5;
           $origunits = 'in';
           $xoff = $origheight - 0.9;
           $yoffl = 0.0;
       } elsif ($paper eq 'legal') {
           $ptype = '';
           $origwidth = 14.0;
           $origheight = 8.5;
           $origunits = 'in';
           $xoff = $origheight - 3.0;
           $yoffl = 0.5;
       } elsif ($paper eq 'a4') {
           $origwidth = 29.7;
           $origheight = 21.0;
           $origunits = 'cm';
           $xoff = $origheight;
           $yoffl = 0.7;
       }
       if (($origwidth ne '') && ($yoffl ne '')) {
           $yoffr = $origwidth/2 + $yoffl;
       }
       return ($ptype,$xoff,$yoffl,$yoffr,$origunits);
   }
   
 $|=1;  $|=1;
 if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {  if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {
     print <<END;      print <<END;
Line 210  if ($student_names=~/_END_/) { Line 241  if ($student_names=~/_END_/) {
     @names_pack=split(/_ENDPERSON_/,$student_names);      @names_pack=split(/_ENDPERSON_/,$student_names);
 }  }
 if ($backref) {  if ($backref) {
       if ($backref =~ m{^(/uploaded/$LONCAPA::match_domain/$LONCAPA::match_courseid/default_\d+.page)}) {
           $backref = $1;
       }
     print('<p>'.&mt("[_1]Return[_2] to resource.",      print('<p>'.&mt("[_1]Return[_2] to resource.",
     "<a href=\"$backref\"><b>","</b></a>").'</p>');      "<a href=\"$backref\"><b>","</b></a>").'</p>');
     print('<p><a href="javascript:gopost(\'/adm/printout\',\''.$backref.'\');">'.      print('<p><a href="javascript:gopost(\'/adm/printout\',\''.$backref.'\');">'.
Line 443  foreach $texfile (@texfile) { Line 477  foreach $texfile (@texfile) {
   $new_name_file =~ s/\.dvi/\.ps/;    $new_name_file =~ s/\.dvi/\.ps/;
 # Explicitly include a switch for papertype, otherwise dvips will default  # Explicitly include a switch for papertype, otherwise dvips will default
 # to whatever is listed first in config.ps (which in most cases is a4).  # to whatever is listed first in config.ps (which in most cases is a4).
 # Historically (since 2004) LON-CAPA printing expected to use the default,    my $papera;
 # i.e., a papertype of a4, when the user selected letter [8 1/2 x 11 in]     unless (($paper eq '') ||
 # in the Layout options, so I follow that convention if $papera is letter.                      (($laystyle eq 'album') && ($numberofcolumns eq '1'))) {
   my $papera=$paper;        $papera='-t'.$paper;
   if ($papera eq 'letter') {$papera='a4';}    }
   if ($papera ne '') {$papera='-t'.$papera;}  
   my $extra_ps_header = $perlvar{'lonLib'} .'/includepsheader.ps';    my $extra_ps_header = $perlvar{'lonLib'} .'/includepsheader.ps';
   my $comma = "dvips $papera -h $extra_ps_header -Ppdf -G0 -o  $new_name_file";    my $comma = "dvips $papera -h $extra_ps_header -Ppdf -G0 -o  $new_name_file";
   &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",    &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
Line 503  foreach $texfile (@texfile) { Line 536  foreach $texfile (@texfile) {
       $new_name_file =~ m/^(.*)\./;        $new_name_file =~ m/^(.*)\./;
       my $ps_file = my $tempo_file = $1.'temporar.ps';        my $ps_file = my $tempo_file = $1.'temporar.ps';
       my $pdf_file = $1.'.pdf';        my $pdf_file = $1.'.pdf';
       $papera=~s/t/p/;        unless ($paper eq '') {
             $papera='-p'.$paper;
         }
 #----  #----
 # The code below uses fixps to make pdf include in sequences work.  # The code below uses fixps to make pdf include in sequences work.
 #  #
Line 518  foreach $texfile (@texfile) { Line 553  foreach $texfile (@texfile) {
   
       # Use gs to fix the postscript -> level 1.5         # Use gs to fix the postscript -> level 1.5 
       # .. if pdfs were included        # .. if pdfs were included
         #
         # pswrite device was removed from ghostscript 9.09 and later,
         # (ps2write device is used instead).
         # check which device is available, and use as the value
                 # passed via -sDEVICE= arg in gs call to fix the postscript.
         #
   
       if ($pdfs_converted > 0) {        if ($pdfs_converted > 0) {
   $comma = "gs -sDEVICE=pswrite -dLanguageLevel=1.5 ";    my @possdevices = qw(ps2write pswrite);
   &busy_wait_command("$comma -o $tempo_file $new_name_file 2>/dev/null 1>/dev/null",    my $device;
      "for $status_statement now validating PS",    foreach my $poss (@possdevices) {
      \%prog_state, $tempo_file);        if (open(PIPE,"gs -h |grep ' $poss ' 2>&1 |")) {
               my $output = <PIPE>;
             close(PIPE);
             chomp($output);
             if ($output =~ /\Q $poss \E/) {
                 $device = $poss;
             }
         }
         last if ($device ne '');
     }
     if ($device ne '') {
         my ($major,$minor);
         if (open(PIPE,"gs -v |grep 'GPL Ghostscript' 2>&1 |")) {
             my $info = <PIPE>;
             close(PIPE);
             chomp($info);
             if ($info =~ /Ghostscript\s+(\d+)\.(\d+)/) {
                 ($major,$minor) = ($1,$2);
             }
         }
         $comma = "gs -sDEVICE=$device -dLanguageLevel=1.5 ";
         if (($major > 9) || (($major == 9) && ($minor >= 50))) {
             $comma .= '--permit-file-read=* ';
         }
         &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",        if (-e $tempo_file) {
      'File move', \%prog_state, $new_name_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";    my $canscale;
   &debug("PSNUP command: $comma");    if (open(PIPE,"psnup --version 2>&1 |")) {
         while (<PIPE>) {
     chomp();
                             next if (/pstops:\s+invalid\s+option/);
                             if (/^psnup\s+release\s+(\d+)\s+patchlevel\s+(\d+)/) {
                                 if (($1 == 1) && ($2 < 90)) {
                                     $canscale = 1;
                                 }
                                 last;
                             } elsif (/^psnup\s+(\d+)\.(\d+)/) {
                                 if (($1 == 1) && ($2 < 90)) {
                                     $canscale = 1;
                                 }
                                 last;
                             }
         }
         close(PIPE);
     }
     if ($canscale) {
         $comma = "psnup $papera -2 -s1.0 $new_name_file";
                         &debug("PSNUP command: $comma");
                     } elsif (($paper eq 'letter') || ($paper eq 'legal') || ($paper eq 'a4')) {
                         my ($ptype,$xoff,$yoffl,$yoffr,$units) = &get_pstops_offsets($paper);
                         $comma = "pstops $ptype '2:0L\@1.0($xoff$units,$yoffl$units)+1L\@1.0($xoff$units,$yoffr$units)' $new_name_file";
                         &debug("PSTOPS command: $comma");
     } else {
         $comma = "psnup $papera -2 $new_name_file";
                         &debug("PSNUP command: $comma");
     }
   &busy_wait_command("$comma $tempo_file 1>/dev/null 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);
Line 544  foreach $texfile (@texfile) { Line 642  foreach $texfile (@texfile) {
       } else {        } else {
   $ps_file=$new_name_file;    $ps_file=$new_name_file;
       }        }
       my $addtoPSfile={'legal'=>'<< /PageSize [612 1008] >> setpagedevice',                my $addtoPSfile={'letter'=>'<< /PageSize [612 792] >> setpagedevice',
                                  'legal'=>'<< /PageSize [612 1008] >> setpagedevice',
                                'tabloid'=>'<< /PageSize [792 1224] >> setpagedevice',                                 'tabloid'=>'<< /PageSize [792 1224] >> setpagedevice',
                                'executive'=>,'<< /PageSize [540 720] >> setpagedevice',                                 'executive'=>,'<< /PageSize [540 720] >> setpagedevice',
                                'a2'=>'<< /PageSize [1195.02 1690.09] >> setpagedevice',                                 'a2'=>'<< /PageSize [1195.02 1690.09] >> setpagedevice',
Line 552  foreach $texfile (@texfile) { Line 651  foreach $texfile (@texfile) {
                                'a4'=>'<< /PageSize [595.2 842] >> setpagedevice',                                 'a4'=>'<< /PageSize [595.2 842] >> setpagedevice',
                                'a5'=>'<< /PageSize [421.1 595.2] >> setpagedevice',                                 'a5'=>'<< /PageSize [421.1 595.2] >> setpagedevice',
                                'a6'=>'<< /PageSize [298.75 421.1] >> setpagedevice',                                 'a6'=>'<< /PageSize [298.75 421.1] >> setpagedevice',
    };                                };
       if ($paper ne 'letter') {        open(FFH,'<',$ps_file) || die "Couldn't open ps file $ps_file for reading: $!\n";
   open(FFH,'<',$ps_file) || die "Couldn't open ps file $ps_file for reading: $!\n";        my $new_ps_file='new'.$ps_file;
   my $new_ps_file='new'.$ps_file;        open(FFHS,'>',$new_ps_file) || die "Couldn't open new ps file $new_ps_file for reading: $!\n";
   open(FFHS,'>',$new_ps_file) || die "Couldn't open new ps file $new_ps_file for reading: $!\n";        print FFHS $addtoPSfile->{$paper}."\n";
   print FFHS $addtoPSfile->{$paper}."\n";        while (<FFH>) {
   while (<FFH>) {            print FFHS $_;
       print FFHS $_;  
   }  
   close(FFH);  
   close(FFHS);  
   $ps_file=$new_ps_file;    
       }        }
         close(FFH);
         close(FFHS);
         $ps_file=$new_ps_file;  
       &busy_wait_command("ps2pdf13 $ps_file $pdf_file 1>/dev/null 2>/dev/null",        &busy_wait_command("ps2pdf13 $ps_file $pdf_file 1>/dev/null 2>/dev/null",
  "for $status_statement now Converting PS to PDF",   "for $status_statement now Converting PS to PDF",
  \%prog_state,$pdf_file);   \%prog_state,$pdf_file);
Line 597  foreach $texfile (@texfile) { Line 694  foreach $texfile (@texfile) {
          .'</p>';           .'</p>';
   }    }
 }  }
   if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
 print "<br />";  print "<br />";
 if ($number_of_files>1) {  if ($number_of_files>1) {
       print('<p>'.&mt('Zip Output:')."\n");
       my %zip_prog_state;
       if ($advanced_role) { %zip_prog_state=&Apache::lonhtmlcommon::Create_PrgWin('',$number_of_files); }
     my $zipfile=$texfile[0];      my $zipfile=$texfile[0];
     $zipfile=~s/\.tex/\.zip/;      $zipfile=~s/\.tex/\.zip/;
     my $statement="zip $zipfile";      my $zip = Archive::Zip->new();
       my $counter = 0;
     foreach my $file (@texfile) {      foreach my $file (@texfile) {
  $file=~s/\.tex/.\pdf/;          $file=~s/\.tex/.\pdf/;
  $statement.=' '.$file;           my $dest=$file;
           $dest=~s{^\Q$perlvar{'lonPrtDir'}\E}{prtspool};
           $zip->addFile($file,$dest);
           $dest=~s/^prtspool//;
           $counter ++;
           if ($advanced_role) {
               &Apache::lonhtmlcommon::Update_PrgWin('',\%zip_prog_state,
                                                     &mt('[_1] added to zip archive ([_2] of [_3]',
                                                     $dest,$counter,$number_of_files));
           }
       }
       if ($advanced_role) {
           &Apache::lonhtmlcommon::Update_PrgWin('',\%zip_prog_state,&mt('Writing zip file'));
     }      }
     print('<p>'.&mt('Zip Output:')."\n<pre>\n");      if ($zip->writeToFileNamed($zipfile) == AZ_OK) {
     system($statement);          $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
     print("</pre></p>\n");          print
     $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};              '<p>'
     print             .&mt('A [_1]ZIP file[_2] of all the PDF files is ready for download.',
         '<p>'                  '<a href="'.$zipfile.'">','</a>')
        .&mt('A [_1]ZIP file[_2] of all the PDF files is ready for download.',             .'</p>';
             '<a href="'.$zipfile.'">','</a>')      } else {
        .'</p>';          print '<p class="LC_error">'.
                 &mt('An error occurred creating a ZIP file of all the PDF files').
                '</p>';
       }
       if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%zip_prog_state); }
 }  }
 if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }  
 print(&Apache::loncommon::end_page());  print(&Apache::loncommon::end_page());
 my $done;  my $done;
   
Line 960  sub convert_figure { Line 1077  sub convert_figure {
  &File::Path::mkpath($path,0,0777);   &File::Path::mkpath($path,0,0777);
  $not_eps =~ s/^\s+//;   $not_eps =~ s/^\s+//;
  $not_eps =~ s/\s+$//;   $not_eps =~ s/\s+$//;
  $not_eps =~ s/ /\\ /g;  
     my $prettyname=$not_eps;      my $prettyname=$not_eps;
  if ($advanced_role) {   if ($advanced_role) {
     $prettyname=~s|$perlvar{'lonDocRoot'}/|/|;      $prettyname=~s|$perlvar{'lonDocRoot'}/|/|;
Line 980  sub convert_figure { Line 1096  sub convert_figure {
     $eps_f = $perlvar{'lonPrtDir'}.'/'.$eps_f;      $eps_f = $perlvar{'lonPrtDir'}.'/'.$eps_f;
   
     &debug("Converting pdf $not_eps to postscript: $eps_f");      &debug("Converting pdf $not_eps to postscript: $eps_f");
     system("pdftops $not_eps $eps_f");              my @args = ('pdftops',$not_eps,$eps_f);
     $pdfs_converted++; # Need to fix ps in last pass.              system({$args[0]} @args); # Indirect object forces list processing mode.
                                         # See perlfunc documentation for exec().
               if ($? and $advanced_role) {
                   print '<p class="LC_warning">'
                        .&mt('An error occurred during the conversion of [_1] to postscript.',
                             '<span class="LC_filename">'.$prettyname.'</span>')
                        .'</p>';
               } else {
                   $pdfs_converted++; # Need to fix ps in last pass.
               }
  } else {   } else {
     system("convert $not_eps $eps_f");              my @args = ('convert',$not_eps,$eps_f);
         if($? and $advanced_role){              system({$args[0]} @args); # Indirect object forces list processing mode.
             print '<p class="LC_warning">'                                        # See perlfunc documentation for exec().
                  .&mt('An error occurred during the conversion of [_1].',              if ($? and $advanced_role) {
                   print '<p class="LC_warning">'
                        .&mt('An error occurred during the conversion of [_1].',
                           '<span class="LC_filename">'.$prettyname.'</span>')                            '<span class="LC_filename">'.$prettyname.'</span>')
                  .'<br />'                       .'<br />'
                  .&mt('If possible try to save this image using different settings and republish it.')                       .&mt('If possible try to save this image using different settings and republish it.')
                  .'</p>';                       .'</p>';
         }              }
  }   }
   
  if (not -e $eps_f) {   if (not -e $eps_f) {
Removed from v.1.164  
changed lines
  Added in v.1.177

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