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

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

version 1.140, 2009/03/24 10:29:39 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;
   
 my $busy_wait_timeout = 30;   my $busy_wait_timeout = 30; 
   my $pdfs_converted    = 0; # non zero if PDF includes (need to fixps).
   
   my $debugging = 0;
   
 sub debug {  sub debug {
     my ($text) = @_;      if ($debugging) {
     print "$text <br />\n";   my ($text) = @_;
    print "$text <br />\n";
       }
 }  }
   
 #   Determine if a user is operating as a student for this course/domain.  #   Determine if a user is operating as a student for this course/domain.
Line 118  sub send_error_mail { Line 125  sub send_error_mail {
   
  if (&is_student()) {   if (&is_student()) {
     # build the subject and message body:      # build the subject and message body:
     # print "sending message to course coordinators.<br />";      &debug("sending message to course coordinators.");
   
     # Todo: Convert badurl into a url from file path:      # Todo: Convert badurl into a url from file path:
   
     my $subject  = "Error [$badurl] Print failed for $user".'@'.$domain;      my $subject  = "Error [$badurl] Print failed for $user".':'.$domain;
     my $message .= "Print failed to render LaTeX for $user".'@'."$domain\n";      my $message .= "Print failed to render LaTeX for $user".':'."$domain\n";
     $message    .= "  User was attempting to print: \n";      $message    .= "  User was attempting to print: \n";
     foreach my $resource (split(/:/,$resources)) {      foreach my $resource (split(/:/,$resources)) {
  $message    .= "       $resource\n";   $message    .= "       $resource\n";
Line 137  sub send_error_mail { Line 144  sub send_error_mail {
     }      }
     my (undef, %receivers) = &Apache::lonmsg::decide_receiver(undef, 0,      my (undef, %receivers) = &Apache::lonmsg::decide_receiver(undef, 0,
       1,1,1);        1,1,1);
     # print "<br /> sending...section:  $env{'request.course.sec'}";      &debug("sending...section:  $env{'request.course.sec'}");
     foreach my $dest (keys %receivers) {      foreach my $dest (keys %receivers) {
  # print "<br /> dest is $dest";   &debug("dest is $dest");
  my @destinfo = split(/:/,$dest);   my @destinfo = split(/:/,$dest);
  my $user = $destinfo[0];   my $user = $destinfo[0];
  my $dom  = $destinfo[1];   my $dom  = $destinfo[1];
Line 166  Your cookie information is incorrect. Line 173  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')};
 &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 186  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 194  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) {
     print('<p>'.&mt("[_1]Return[_2] to editing resource.",      if ($backref =~ m{^(/uploaded/$LONCAPA::match_domain/$LONCAPA::match_courseid/default_\d+.page)}) {
           $backref = $1;
       }
       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 211  $duefile =~ s/^(.*_printout)_\d+_\d+_\d+ Line 233  $duefile =~ s/^(.*_printout)_\d+_\d+_\d+
 #   it contains the names of the files that need to be converted, one per line.  #   it contains the names of the files that need to be converted, one per line.
 #  #
   
   &debug("Figure file is $figfile");
   
 if (-e $figfile) {  if (-e $figfile) {
     # print "$figfile exists\n";      &debug( "Figure file exists");
       &debug("$figfile exists");
     my %done_conversion;      my %done_conversion;
     my $temporary_file=IO::File->new($figfile) || die "Couldn't open fig file $figfile for reading: $!\n";      my $temporary_file=IO::File->new($figfile) || die "Couldn't open fig file $figfile for reading: $!\n";
     my @content_of_file = <$temporary_file>;      my @content_of_file = <$temporary_file>;
     close $temporary_file;        close $temporary_file;  
     my $noteps;      my $noteps;
     my %prog_state;      my %prog_state;
     if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Converting Images to EPS','Picture Conversion Status',$#content_of_file,'inline','80');  }      if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('',$#content_of_file);  }
     print('<br />');      print('<br />');
     foreach my $not_eps (@content_of_file) {      foreach my $not_eps (@content_of_file) {
  chomp($not_eps);   chomp($not_eps);
    &debug( "Being asked to convert $not_eps");
  if ($not_eps ne '') {   if ($not_eps ne '') {
     $not_eps=~s|\/\.\/|\/|g;      $not_eps=~s|\/\.\/|\/|g;
     if (!$done_conversion{$not_eps}) { #  Only convert multiple includes once.      if (!$done_conversion{$not_eps}) { #  Only convert multiple includes once.
Line 264  my $ind=-1; Line 290  my $ind=-1;
   
 my %prog_state;  my %prog_state;
 if ($advanced_role) {   if ($advanced_role) { 
     %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status',&mt('Class Print Status'),$number_of_files,'inline','80');       %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('',$number_of_files); 
 }  }
 print "<br />";  print "<br />";
 my $num_files = @texfile; # How does this differ from $number_of_files , can that be 0?  my $num_files = @texfile; # How does this differ from $number_of_files , can that be 0?
Line 289  foreach $texfile (@texfile) { Line 315  foreach $texfile (@texfile) {
   my $name;    my $name;
   my $name_range='';    my $name_range='';
   
   # $name       -> Either user's full name or username@domain    # $name       -> Either user's full name or username:domain
   # $name_range -> Either user's last name or usrname.    # $name_range -> Either user's last name or username.
   
   if ($tempo_array[3]) {    if ($tempo_array[3]) {
       $name=$tempo_array[3];        $name=$tempo_array[3];
       ($name_range) = split(/,/,$name, 2);        $name =~ s{^\s+|\s+$}{}g;
         if ($name =~ /,/) { 
             ($name_range) = split(/,/,$name, 2);
         } elsif ($name =~ /\s/) {
             $name_range = $name;
             $name_range =~ s/\s+/_/;
         } else {
             $name_range = $name;  
         }
         $name_range =~ s/[^\w\:\-]+//g;
   } else {    } else {
       $name=$tempo_array[0].'@'.$tempo_array[1];        $name=$tempo_array[0].':'.$tempo_array[1];
       $name_range = $tempo_array[0];        $name_range = $tempo_array[0];
   }    }
   
Line 304  foreach $texfile (@texfile) { Line 339  foreach $texfile (@texfile) {
   # user is getting printed.    # user is getting printed.
   #    #
   
   if (($name ne "") && ($name ne '@') ) { # Could be printing codes...    if (($name ne "") && ($name ne ':') ) { # Could be printing codes...
       $link_text='<b>'.$name.'</b>';        $link_text='<b>'.$name.'</b>';
       $status_statement.=$name;        $status_statement.=$name;
   }    }
Line 317  foreach $texfile (@texfile) { Line 352  foreach $texfile (@texfile) {
       @tempo_array=split(/:/,$stud_info[-1]);        @tempo_array=split(/:/,$stud_info[-1]);
       if ($tempo_array[3]) {        if ($tempo_array[3]) {
   $name=$tempo_array[3];    $name=$tempo_array[3];
   my ($lastname) = split(/,/, $name,2);            $name =~ s{^\s+|\s+$}{}g;
             my $lastname;
             if ($name =~ /,/) {
         ($lastname) = split(/,/, $name,2);
             } elsif ($name =~ /\s/) {
                 $lastname = $name;
                 $lastname =~ s/\s+/_/;
             } else {
                 $lastname = $name;
             }
   $name_range .= "-".$lastname;    $name_range .= "-".$lastname;
             $name_range =~ s/[^\w\:\-]+//g;
       } else {        } else {
   $name=$tempo_array[0].'@'.$tempo_array[1];    $name=$tempo_array[0].':'.$tempo_array[1];
   $name_range .= '-'.$tempo_array[0];    $name_range .= '-'.$tempo_array[0];
       }        }
       if (($name ne "") && ($name ne '@')) {        if (($name ne "") && ($name ne ':')) {
   $link_text.=' - <b>'.$name.'</b>';    $link_text.=' - <b>'.$name.'</b>';
   $status_statement.=' -  '.$name;    $status_statement.=' -  '.$name;
       
Line 353  foreach $texfile (@texfile) { Line 398  foreach $texfile (@texfile) {
   
   print "<br/>";    print "<br/>";
   if ($advanced_role) {     if ($advanced_role) { 
       &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement);         &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt('Creating PDF for: [_1]',$status_statement)); 
   }    }
   
   if (-e $texfile) { # Ensure the tex file exists:    if (-e $texfile) { # Ensure the tex file exists:
Line 400  foreach $texfile (@texfile) { Line 445  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 458  foreach $texfile (@texfile) { Line 508  foreach $texfile (@texfile) {
       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/;        $papera=~s/t/p/;
   #----
   # The code below uses fixps to make pdf include in sequences work.
   #
   #              $comma = "fixps --force $new_name_file";
   #              &debug("FIXPS command: $comma");
   #              &busy_wait_command("$comma 1>$tempo_file  2>/dev/null",
   #                                 "for $status_statement now validating PS",
   #                                 \%prog_state,$tempo_file);
   
   #--- 
   #  The code below uses gs to make pdf includes in sequences work
   
         # Use gs to fix the postscript -> level 1.5 
         # .. if pdfs were included
   
         if ($pdfs_converted > 0) {
     $comma = "gs -sDEVICE=pswrite -dLanguageLevel=1.5 ";
     &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",
        '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");
   &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);
       } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {        } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
   $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"';    $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)" '.$new_name_file;
   &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",    &debug("PSTOPS command: $comma ");
     &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); 
       } else {        } else {
Line 492  foreach $texfile (@texfile) { Line 569  foreach $texfile (@texfile) {
   close(FFHS);    close(FFHS);
   $ps_file=$new_ps_file;      $ps_file=$new_ps_file;  
       }        }
       &busy_wait_command("ps2pdf $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 507  foreach $texfile (@texfile) { Line 584  foreach $texfile (@texfile) {
       my @garb = ($texlog,$texaux,$texdvi,$texps);        my @garb = ($texlog,$texaux,$texdvi,$texps);
 #  unlink @garb;  #  unlink @garb;
       unlink($duefile);        unlink($duefile);
       print "<a href=\"/prtspool/$pdf_file\">$link_text - click here to download pdf</a>";        print
       print "\n";                    '<p>'
                    .&mt('[_1] - [_2]Your PDF file[_3] is ready for download.',
                         $link_text,'<a href="/prtspool/'.$pdf_file.'">','</a>')
                    .'</p>'."\n";
   }    }
   unlink($missfonts_file);    unlink($missfonts_file);
   
       }          }  
   } else {    } else {
       print "LaTeX file $texfile was not created successfully";        print
             '<p class="LC_error">'
            .&mt('The LaTeX file [_1] was not created successfully.',
                 '<span class="LC_filename">'.$texfile.'</span>')
            .'</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("<pre>Zip Output:\n");      if ($zip->writeToFileNamed($zipfile) == AZ_OK) {
     system($statement);          $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
     print("</pre>");          print
     $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};              '<p>'
     print "<br /> A <a href=\"$zipfile\">ZIP file</a> of all the PDFs.";             .&mt('A [_1]ZIP file[_2] of all the PDF files is ready for download.',
                   '<a href="'.$zipfile.'">','</a>')
              .'</p>';
       } else {
           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 568  sub busy_wait_command { Line 676  sub busy_wait_command {
     if ($size == $last_size) {      if ($size == $last_size) {
  $unchanged_time++;   $unchanged_time++;
  if ($timeout && ($unchanged_time > $timeout)) {   if ($timeout && ($unchanged_time > $timeout)) {
     print "<h1>Operation timed out!</h1>\n";      print '<p class="LC_error">'.&mt('Operation timed out!')."</p>\n";
     print "<p>Executing $command, the output file $output_file did not grow\n";      print "<p>Executing $command, the output file $output_file did not grow\n";
     print "after $timeout seconds.  This <em>may</em> indicate $command\n";      print "after $timeout seconds.  This <em>may</em> indicate $command\n";
     print "is in an infinite loop.\n";      print "is in an infinite loop.\n";
Line 583  sub busy_wait_command { Line 691  sub busy_wait_command {
     }      }
  }   }
  if ($advanced_role) {   if ($advanced_role) {
     &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,      &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message.$extra_msg);
   $message.$extra_msg);  
  }   }
     }      }
     $SIG{CHLD}='IGNORE';      $SIG{CHLD}='IGNORE';
Line 681  sub repaginate { Line 788  sub repaginate {
     my @pages_in_student; # For each student his/her initial page count.      my @pages_in_student; # For each student his/her initial page count.
     my $max_pages = 0; # Pages in 'longest' student.      my $max_pages = 0; # Pages in 'longest' student.
     my $page_number = 0;      my $page_number = 0;
     &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,       &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Counting pages for student: [_1]",1));
   &mt("Counting pages for student: [_1]",1));  
   
     while ($line = <PSFILE>) {      while ($line = <PSFILE>) {
   
Line 710  sub repaginate { Line 816  sub repaginate {
  # - save the page_number, reset and, if necessary   # - save the page_number, reset and, if necessary
  #    update max_pages.   #    update max_pages.
  push(@pages_in_student, $page_number);   push(@pages_in_student, $page_number);
  &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,    &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Counting pages for student: [_1]", scalar(@pages_in_student)));
       &mt("Counting pages for student: [_1]", scalar(@pages_in_student)));  
  if ($page_number > $max_pages) {   if ($page_number > $max_pages) {
     $max_pages = $page_number;      $max_pages = $page_number;
  }   }
Line 723  sub repaginate { Line 828  sub repaginate {
     }      }
     # file ended so one more student      # file ended so one more student
     push(@pages_in_student, $page_number);      push(@pages_in_student, $page_number);
     &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,       &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Counting pages for student: [_1]",scalar(@pages_in_student)));
   &mt("Counting pages for student: [_1]",scalar(@pages_in_student)));  
     if ($page_number > $max_pages) {      if ($page_number > $max_pages) {
  $max_pages = $page_number;   $max_pages = $page_number;
     }      }
Line 751  sub repaginate { Line 855  sub repaginate {
   
   
     my $student_number    = 0; # Index of student we're working on.      my $student_number    = 0; # Index of student we're working on.
     &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,       &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Repaginating student: [_1]",$student_number+1));
   "Repaginating student ".$student_number+1);  
   
     while (my $line = <LATEXIN>) {      while (my $line = <LATEXIN>) {
  if ($line eq "\\special{ps:ENDOFSTUDENTSTAMP}\n") {   if ($line eq "\\special{ps:ENDOFSTUDENTSTAMP}\n") {
Line 769  sub repaginate { Line 872  sub repaginate {
     }      }
           
     $student_number++;      $student_number++;
     &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,       &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt("Repaginating student: [_1]",$student_number+1));
   "Repaginating student ".$student_number+1);  
           
  } else {   } else {
     print LATEXOUT $line;      print LATEXOUT $line;
Line 846  sub create_missing_fonts { Line 948  sub create_missing_fonts {
 #  #
 sub convert_figure {  sub convert_figure {
     my ($not_eps) = @_;      my ($not_eps) = @_;
       &debug("in convert_figure");
   
     my $status_statement='EPS picture for '.$not_eps;      my $status_statement='EPS picture for '.$not_eps;
     my $eps_f = $not_eps;      my $eps_f = $not_eps;
   
     if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) {      if ($eps_f=~/\/home\/httpd\/html\/priv\/[^\/]+\/([^\/]+)\//) {
  $eps_f=~s/\/home\/([^\/]+)\/public_html/$1/;   $eps_f=~s/\/home\/httpd\/html\/priv\/[^\/]+\/([^\/]+)/$1/;
     } elsif ($eps_f=~/$perlvar{'lonDocRoot'}\/res\//) {      } elsif ($eps_f=~/$perlvar{'lonDocRoot'}\/res\//) {
  $eps_f=~ s/$perlvar{'lonDocRoot'}\/res\/(.+)/$1/;   $eps_f=~ s/$perlvar{'lonDocRoot'}\/res\/(.+)/$1/;
     } elsif ($eps_f=~/$perlvar{'lonUsersDir'}\//) {      } elsif ($eps_f=~/$perlvar{'lonUsersDir'}\//) {
Line 862  sub convert_figure { Line 965  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 882  sub convert_figure { Line 985  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|$perlvar{'lonDocRoot'}/|/|;      $prettyname=~s|$perlvar{'lonDocRoot'}/|/|;
     &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,      &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,&mt('Converting to EPS: [_1]',$prettyname));
   'Converting to EPS '.$prettyname);   }
    #
    #  If the file is a PDF, need to use pdftops to convert it to a ps file.
    #  otherwise use imagemagik:
    #
    if($not_eps =~/\.(pdf|PDF)$/) {
   
       #
       # For whatever reason, pure postscript conversions have to be
       # in the same dir as the base file:
       #
       $eps_f = &basename($eps_f);
       $eps_f = $perlvar{'lonPrtDir'}.'/'.$eps_f;
   
       &debug("Converting pdf $not_eps to postscript: $eps_f");
               my @args = ('pdftops',$not_eps,$eps_f);
               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 {
               my @args = ('convert',$not_eps,$eps_f);
               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].',
                             '<span class="LC_filename">'.$prettyname.'</span>')
                        .'<br />'
                        .&mt('If possible try to save this image using different settings and republish it.')
                        .'</p>';
               }
  }   }
  system("convert $not_eps $eps_f");  
   
  if (not -e $eps_f) {   if (not -e $eps_f) {
     # converting an animated gif creates either:      # converting an animated gif creates either:
Line 976  sub analyze_logfile { Line 1114  sub analyze_logfile {
     print "<h2>".&mt('LaTeX could not successfully parse your TeX file.')."</h2>";      print "<h2>".&mt('LaTeX could not successfully parse your TeX file.')."</h2>";
     print &mt('It probably has errors in it.')."<br />";      print &mt('It probably has errors in it.')."<br />";
     if ($badtext) {      if ($badtext) {
                 print &mt('With very high probability this error occured in [_1].',$badtext)                  print &mt('With very high probability this error occurred in [_1].',$badtext)
                      ."<br /><br />";                       ."<br /><br />";
             }              }
     print &mt('Here are the error messages in the LaTeX log file:')      print &mt('Here are the error messages in the LaTeX log file:')
Line 1026  sub analyze_logfile { Line 1164  sub analyze_logfile {
     #    $name_file     - is the name of the LaTeX file.      #    $name_file     - is the name of the LaTeX file.
     #    $identifier    - is the unique LaTeX identifier.l      #    $identifier    - is the unique LaTeX identifier.l
           
             print "<br />";              print '<p class="LC_error">';
     if ($badtext) {      if ($badtext) {
                 print &mt('There are errors in [_1].',$badtext);                  print &mt('There are errors in [_1].',$badtext);
             } else {              } else {
                 print &mt('There are errors.');                  print &mt('There are errors.');
             }              }
     print "<br />".&mt('These errors prevent this resource from printing correctly.');              print '</p>'
                    .&mt('These errors prevent this resource from printing correctly.');
   
     my $tex_handle = IO::File->new($texfile);      my $tex_handle = IO::File->new($texfile);
     my @tex_contents = <$tex_handle>;      my @tex_contents = <$tex_handle>;
     &send_error_mail($identifier, $badresource, $body_log_file, \@tex_contents);      &send_error_mail($identifier, $badresource, $body_log_file, \@tex_contents);
Line 1063  sub analyze_logfile { Line 1203  sub analyze_logfile {
     my $whereitends = index $body_log_file,'STAMPOFPASSEDRESOURCEEND',$whereitbegins;      my $whereitends = index $body_log_file,'STAMPOFPASSEDRESOURCEEND',$whereitbegins;
     print "<br />"      print "<br />"
                  .&mt('It has found an error in [_1][_2]and corrected it.',substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26),"<br />")."\n";                   .&mt('It has found an error in [_1][_2]and corrected it.',substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26),"<br />")."\n";
     print &mt('Usually this correction is valid but you probably need to check the indicated resource one more time and implement neccessary corrections by yourself.')."\n";      print &mt('Usually this correction is valid but you probably need to check the indicated resource one more time and implement necessary corrections by yourself.')."\n";
     $whereitbegins = index $body_log_file,'<inserted text>',$tempobegin+10;      $whereitbegins = index $body_log_file,'<inserted text>',$tempobegin+10;
  }   }
   
Removed from v.1.140  
changed lines
  Added in v.1.167

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