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

Diff for /loncom/interface/printout.pl between versions 1.121 and 1.127

version 1.121, 2007/02/22 01:00:13 version 1.127, 2007/09/21 21:11:20
Line 39  use Apache::loncommon(); Line 39  use Apache::loncommon();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonmsg();  use Apache::lonmsg();
 use LONCAPA::Enrollment;  use LONCAPA::Enrollment;
   use LONCAPA::Configuration;
   
 use strict;  use strict;
   
Line 128  sub send_error_mail { Line 129  sub send_error_mail {
     foreach my $line (@$texfile) {      foreach my $line (@$texfile) {
  $message .= "$line\n";   $message .= "$line\n";
     }      }
     my (undef, %receivers) = &Apache::lonfeedback::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'}";      # print "<br /> sending...section:  $env{'request.course.sec'}";
     foreach my $dest (keys %receivers) {      foreach my $dest (keys %receivers) {
  # print "<br /> dest is $dest";   # print "<br /> dest is $dest";
Line 161  Your cookie information is incorrect. Line 162  Your cookie information is incorrect.
 END  END
     return;      return;
 }  }
   
   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');
   
Line 214  print "<a href=\"$backref\"><b>Return</b Line 217  print "<a href=\"$backref\"><b>Return</b
       # $eps_f =~ s/\.[^.]*$/\.eps/i;        # $eps_f =~ s/\.[^.]*$/\.eps/i;
       if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) {        if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) {
                   $eps_f=~s/\/home\/([^\/]+)\/public_html/$1/;                    $eps_f=~s/\/home\/([^\/]+)\/public_html/$1/;
   $eps_f = '/home/httpd/prtspool/'.$eps_f;    $eps_f = $perlvar{'lonPrtDir'}.'/'.$eps_f;
       } elsif ($eps_f=~/$Apache::lonnet::perlvar{'lonDocRoot'}\/res\//) {        } elsif ($eps_f=~/$perlvar{'lonDocRoot'}\/res\//) {
   $eps_f=~m/$Apache::lonnet::perlvar{'lonDocRoot'}\/res\/(.+)/;    $eps_f=~m/$perlvar{'lonDocRoot'}\/res\/(.+)/;
   $eps_f = '/home/httpd/prtspool/'.$1;    $eps_f = $perlvar{'lonPrtDir'}.'/'.$1;
       } elsif ($eps_f=~/$Apache::lonnet::perlvar{'lonUsersDir'}\//) {        } elsif ($eps_f=~/$perlvar{'lonUsersDir'}\//) {
   $eps_f=~/$Apache::lonnet::perlvar{'lonUsersDir'}\/([^\/]+)\/\w\/\w\/\w\/(.+)/;    $eps_f=~/$perlvar{'lonUsersDir'}\/([^\/]+)\/\w\/\w\/\w\/(.+)/;
   $eps_f = '/home/httpd/prtspool/'.$1.'/'.$2;    $eps_f = $perlvar{'lonPrtDir'}.'/'.$1.'/'.$2;
       }        }
       $eps_f  =~ s/ /\_/g; # Spaces are problematic for system commands and LaTeX.        $eps_f  =~ s/ /\_/g; # Spaces are problematic for system commands and LaTeX.
       #         # 
Line 253  print "<a href=\"$backref\"><b>Return</b Line 256  print "<a href=\"$backref\"><b>Return</b
   if ($advanced_role) {    if ($advanced_role) {
       my $prettyname=$not_eps;        my $prettyname=$not_eps;
       $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;        $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;
       $prettyname=~s|$Apache::lonnet::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);
   }    }
Line 441  foreach $texfile (@texfile) { Line 444  foreach $texfile (@texfile) {
       print "</pre>\n";        print "</pre>\n";
       # print "<br /> Advanced role <br />";        # print "<br /> Advanced role <br />";
               print "<b><big>The link to ";                print "<b><big>The link to ";
               $logfilename=~s/\/home\/httpd//;                $logfilename=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
       print "<a href=\"$logfilename\">Your log file </a></big></b>";        print "<a href=\"$logfilename\">Your log file </a></big></b>";
       print "\n";        print "\n";
               #link tooriginal LaTeX file (included according Michael Hamlin desire)                #link tooriginal LaTeX file (included according Michael Hamlin desire)
Line 454  foreach $texfile (@texfile) { Line 457  foreach $texfile (@texfile) {
       print $tex_temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_tex_file.'</pre></body></html>'."\n";        print $tex_temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_tex_file.'</pre></body></html>'."\n";
       print "<br /><br />";        print "<br /><br />";
       print "<b><big>The link to ";        print "<b><big>The link to ";
       $texfile=~s/\/home\/httpd//;                $texfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
       print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";        print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";
       print "\n";        print "\n";
       my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", "Help on printing");        my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", "Help on printing");
Line 520  foreach $texfile (@texfile) { Line 523  foreach $texfile (@texfile) {
       if ($tableofindex eq 'yes') {        if ($tableofindex eq 'yes') {
   my $idxname = $latex_file;    my $idxname = $latex_file;
   $idxname =~ s/\.tex$/\.idx/;    $idxname =~ s/\.tex$/\.idx/;
   &busy_wait_command("makindex $idxname",    &busy_wait_command("makeindex $idxname",
      "Re-creating index file",       "Re-creating index file",
      \%prog_state, $idxname);       \%prog_state, $idxname);
   &busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",    &busy_wait_command("latex $latex_file 1>/dev/null 2>/dev/null",
Line 559  foreach $texfile (@texfile) { Line 562  foreach $texfile (@texfile) {
       #print("<br /> Missing fonts file is: $missfonts_file");        #print("<br /> Missing fonts file is: $missfonts_file");
       if (-e $missfonts_file) {        if (-e $missfonts_file) {
   #print("<br />Missing fonts file exists\n");    #print("<br />Missing fonts file exists\n");
   &create_missing_fonts($missfonts_file);    &create_missing_fonts($missfonts_file,\%prog_state);
   &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 dvips generated missing fonts",       "for $status_statement dvips generated missing fonts",
      \%prog_state, $new_name_file);       \%prog_state, $new_name_file);
Line 612  foreach $texfile (@texfile) { Line 615  foreach $texfile (@texfile) {
   if ($advanced_role) {      if ($advanced_role) {  
       print "<br /><br />";        print "<br /><br />";
       print "<b><big>The link to ";        print "<b><big>The link to ";
       $logfilename=~s/\/home\/httpd//;                $logfilename=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
       print "<a href=\"$logfilename\">Your log file </a></big></b>";        print "<a href=\"$logfilename\">Your log file </a></big></b>";
       print "\n";        print "\n";
       #link tooriginal LaTeX file (included according Michael Hamlin desire)        #link tooriginal LaTeX file (included according Michael Hamlin desire)
Line 625  foreach $texfile (@texfile) { Line 628  foreach $texfile (@texfile) {
       print $tex_temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_tex_file.'</pre></body></html>'."\n";        print $tex_temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_tex_file.'</pre></body></html>'."\n";
       print "<br /><br />";        print "<br /><br />";
       print "<b><big>The link to ";        print "<b><big>The link to ";
       $texfile=~s/\/home\/httpd//;                $texfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
       print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";        print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";
       print "\n";        print "\n";
   }    }
Line 670  foreach $texfile (@texfile) { Line 673  foreach $texfile (@texfile) {
   #print("<br /> Missing fonts file is: $missfonts_file");    #print("<br /> Missing fonts file is: $missfonts_file");
   if (-e $missfonts_file) {    if (-e $missfonts_file) {
       #print("<br />Missing fonts file exists\n");        #print("<br />Missing fonts file exists\n");
       &create_missing_fonts($missfonts_file);        &create_missing_fonts($missfonts_file,\%prog_state);
       &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 dvips generated missing fonts",   "for $status_statement dvips generated missing fonts",
  \%prog_state, $new_name_file);   \%prog_state, $new_name_file);
Line 780  if ($number_of_files>1) { Line 783  if ($number_of_files>1) {
     print("<pre>Zip Output:\n");      print("<pre>Zip Output:\n");
     system($statement);      system($statement);
     print("</pre>");      print("</pre>");
     $zipfile=~s/\/home\/httpd//;      $zipfile=~s{^\Q$perlvar{'lonPrtDir'}\E}{/prtspool};
     print "<br /> A <a href=\"$zipfile\">ZIP file</a> of all the PDFs.";      print "<br /> A <a href=\"$zipfile\">ZIP file</a> of all the PDFs.";
 }  }
 if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }  if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
Line 865  sub repaginate { Line 868  sub repaginate {
  #  bottom of the page, m the page number within the document.   #  bottom of the page, m the page number within the document.
  #   #
   
  if ($line =~ /^%%Page:/) {   if ($line =~ /^%%Page:\s+\d+\s+\d+/) {
     my @pageinfo = split(/\s+/, $line);      my @pageinfo = split(/\s+/, $line);
     if ($page_number < $pageinfo[1]) {      if ($page_number < $pageinfo[1]) {
  $page_number = $pageinfo[1];   $page_number = $pageinfo[1];
Line 997  sub create_missing_fonts { Line 1000  sub create_missing_fonts {
  #print("<br />Creating fonts via command: $command");   #print("<br />Creating fonts via command: $command");
  &busy_wait_command("$command 1>/dev/null 2>/dev/null",   &busy_wait_command("$command 1>/dev/null 2>/dev/null",
    "Creating missing font",     "Creating missing font",
    $state, $command);     $state);
         
     }      }
   
Removed from v.1.121  
changed lines
  Added in v.1.127

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