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

Diff for /loncom/interface/printout.pl between versions 1.162 and 1.167

version 1.162, 2016/05/21 21:15:36 version 1.167, 2020/02/18 23:57:54
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 Archive::Zip qw( :ERROR_CODES );
   
 use strict;  use strict;
   
Line 201  my $tableofindex = $env{'cgi.'.$identifi Line 203  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 211  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 446  foreach $texfile (@texfile) { Line 451  foreach $texfile (@texfile) {
 # i.e., a papertype of a4, when the user selected letter [8 1/2 x 11 in]   # 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.    # in the Layout options, so I follow that convention if $papera is letter.  
   my $papera=$paper;    my $papera=$paper;
   if ($papera eq 'letter') {$papera=' a4';}    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 596  foreach $texfile (@texfile) { Line 601  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 979  sub convert_figure { Line 1004  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.162  
changed lines
  Added in v.1.167

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