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

Diff for /loncom/interface/printout.pl between versions 1.149 and 1.152

version 1.149, 2011/05/18 11:26:44 version 1.152, 2012/04/11 11:40:14
Line 237  if (-e $figfile) { Line 237  if (-e $figfile) {
     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);
Line 283  my $ind=-1; Line 283  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 372  foreach $texfile (@texfile) { Line 372  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 614  sub busy_wait_command { Line 614  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 629  sub busy_wait_command { Line 629  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 727  sub repaginate { Line 726  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 756  sub repaginate { Line 754  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 769  sub repaginate { Line 766  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 797  sub repaginate { Line 793  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 815  sub repaginate { Line 810  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 897  sub convert_figure { Line 891  sub 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 931  sub convert_figure { Line 925  sub convert_figure {
  $not_eps =~ s/ /\\ /g;   $not_eps =~ s/ /\\ /g;
     my $prettyname=$not_eps;      my $prettyname=$not_eps;
  if ($advanced_role) {   if ($advanced_role) {
     $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.   #  If the file is a PDF, need to use pdftops to convert it to a ps file.
Removed from v.1.149  
changed lines
  Added in v.1.152

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