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

Diff for /loncom/interface/printout.pl between versions 1.159 and 1.165

version 1.159, 2014/02/28 19:20:06 version 1.165, 2017/11/12 15:41:45
Line 40  use Apache::lonlocal; Line 40  use Apache::lonlocal;
 use Apache::lonmsg();  use Apache::lonmsg();
 use LONCAPA::Enrollment;  use LONCAPA::Enrollment;
 use LONCAPA::Configuration;  use LONCAPA::Configuration;
   use LONCAPA;
   
 use strict;  use strict;
   
Line 201  my $tableofindex = $env{'cgi.'.$identifi Line 202  my $tableofindex = $env{'cgi.'.$identifi
 my $advanced_role = $env{'cgi.'.$identifier.'.role'};  my $advanced_role = $env{'cgi.'.$identifier.'.role'};
 my $number_of_files = $env{'cgi.'.$identifier.'.numberoffiles'}+1;  my $number_of_files = $env{'cgi.'.$identifier.'.numberoffiles'}+1;
 my $student_names = $env{'cgi.'.$identifier.'.studentnames'};  my $student_names = $env{'cgi.'.$identifier.'.studentnames'};
 my $backref = &Apache::lonnet::unescape($env{'cgi.'.$identifier.'.backref'});  my $backref = &unescape($env{'cgi.'.$identifier.'.backref'});
   
   
 my @names_pack=();  my @names_pack=();
Line 209  if ($student_names=~/_END_/) { Line 210  if ($student_names=~/_END_/) {
     @names_pack=split(/_ENDPERSON_/,$student_names);      @names_pack=split(/_ENDPERSON_/,$student_names);
 }  }
 if ($backref) {  if ($backref) {
     print('<p>'.&mt("[_1]Return[_2] to editing 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.'\');">'.
           &mt("Change Printing Options").'</a></p>'."\n");
 }  }
 my $figfile = $texfile;  my $figfile = $texfile;
 $figfile =~ s/^(.*_printout)_\d+_\d+_\d+\.tex/$1\.dat/;  $figfile =~ s/^(.*_printout)_\d+_\d+_\d+\.tex/$1\.dat/;
Line 438  foreach $texfile (@texfile) { Line 441  foreach $texfile (@texfile) {
   $name_file =~ s/\.tex/\.dvi/;    $name_file =~ s/\.tex/\.dvi/;
   my $new_name_file = $name_file;    my $new_name_file = $name_file;
   $new_name_file =~ s/\.dvi/\.ps/;    $new_name_file =~ s/\.dvi/\.ps/;
   # Explicitly include a switch for papertype, otherwise dvips will default
   # 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,
   # i.e., a papertype of a4, when the user selected letter [8 1/2 x 11 in] 
   # in the Layout options, so I follow that convention if $papera is letter.  
   my $papera=$paper;    my $papera=$paper;
   if ($papera eq 'letter') {$papera='';}    if ($papera eq 'letter') {$papera='a4';}
   if ($papera ne '') {$papera='-t'.$papera;}    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";
Line 933  sub convert_figure { Line 941  sub convert_figure {
   
     # Spaces are problematic for system commands and LaTeX, replace with _      # Spaces are problematic for system commands and LaTeX, replace with _
   
     $eps_f  =~ s/ /\_/g;       $eps_f  =~ s/ /\_/g;
   
     #       # 
     # If the file is already an .eps or .ps file (eps_f still has the original      # If the file is already an .eps or .ps file (eps_f still has the original
Line 972  sub convert_figure { Line 980  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.159  
changed lines
  Added in v.1.165

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