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

Diff for /loncom/interface/printout.pl between versions 1.136 and 1.147

version 1.136, 2008/08/07 16:43:18 version 1.147, 2011/02/08 12:53:39
Line 45  use strict; Line 45  use strict;
   
 my $busy_wait_timeout = 30;   my $busy_wait_timeout = 30; 
   
   
   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 123  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:
   
Line 137  sub send_error_mail { Line 142  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 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')};
 &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 211  $duefile =~ s/^(.*_printout)_\d+_\d+_\d+ Line 226  $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>;
Line 223  if (-e $figfile) { Line 241  if (-e $figfile) {
     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 403  foreach $texfile (@texfile) { Line 422  foreach $texfile (@texfile) {
   my $papera=$paper;    my $papera=$paper;
   if ($papera eq 'letter') {$papera='';}    if ($papera eq 'letter') {$papera='';}
   if ($papera ne '') {$papera='-t'.$papera;}    if ($papera ne '') {$papera='-t'.$papera;}
   my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file";    my $extra_ps_header = $perlvar{'lonLib'} .'/includepsheader.ps';
     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",
      "for $status_statement now Converting to PS",       "for $status_statement now Converting to PS",
      \%prog_state,$new_name_file);       \%prog_state,$new_name_file);
Line 457  foreach $texfile (@texfile) { Line 477  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/;
                 $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);
         &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 491  foreach $texfile (@texfile) { Line 520  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 845  sub create_missing_fonts { Line 874  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;
Line 881  sub convert_figure { Line 911  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,
   'Converting to EPS '.$prettyname);    'Converting to EPS '.$prettyname);
  }   }
  system("convert $not_eps $eps_f");   #
    #  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");
       system("pdftops $not_eps $eps_f");
    } else {
       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) {
     # converting an animated gif creates either:      # converting an animated gif creates either:
Line 972  sub analyze_logfile { Line 1026  sub analyze_logfile {
   
  if ($advanced_role) {     if ($advanced_role) {  
     #LaTeX failed to parse tex file       #LaTeX failed to parse tex file 
     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 occured in [_1].',$badtext)
Line 1025  sub analyze_logfile { Line 1079  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 1071  sub analyze_logfile { Line 1127  sub analyze_logfile {
     $logfilename=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};      $logfilename=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
     print "<b><big>"      print "<b><big>"
                  .&mt('The link to [_1]Your log file[_2]'                   .&mt('The link to [_1]Your log file[_2]'
                      ,'<a href="$logfilename">'.$logfilename.'</a>')                       ,'<a href="'.$logfilename.'">','</a>')
          ."</big></b>\n";           ."</big></b>\n";
     #link to original LaTeX file      #link to original LaTeX file
     my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n";      my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n";
Removed from v.1.136  
changed lines
  Added in v.1.147

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