--- loncom/interface/printout.pl 2005/12/15 18:41:21 1.94 +++ loncom/interface/printout.pl 2006/06/12 11:21:07 1.100 @@ -25,20 +25,17 @@ # http://www.lon-capa.org/ # -BEGIN { - eval "use Apache2::compat();"; -}; use lib '/home/httpd/lib/perl'; use LONCAPA::loncgi; use File::Path; use File::Basename; use IO::File; use Image::Magick; -use Apache::lonhtmlcommon; +use Apache::lonhtmlcommon(); use Apache::lonnet; -use Apache::loncommon; +use Apache::loncommon(); use Apache::lonlocal; -use Apache::lonmsg; +use Apache::lonmsg(); use LONCAPA::Enrollment; use strict; @@ -164,8 +161,7 @@ END } &Apache::lonlocal::get_language_handle(); &Apache::loncommon::content_type(undef,'text/html'); - my $bodytag=&Apache::loncommon::bodytag('Creating PDF','',''); - print $bodytag; + print(&Apache::loncommon::start_page('Creating PDF')); my $identifier = $ENV{'QUERY_STRING'}; my $texfile = $env{'cgi.'.$identifier.'.file'}; @@ -242,15 +238,36 @@ print "Return $eps_f"; # Debugging system("convert $not_eps $eps_f"); - #check is eps exist in prtspool - if(not -e $eps_f) { + # check is eps exist in prtspool + if (not -e $eps_f) { + # converting an animated gif creates either: + # anim.gif.eps.0 + # or + # anim.gif-0.eps for (my $i=0;$i<10000;$i++) { if (-e $eps_f.'.'.$i) { - rename $eps_f.'.'.$i, $eps_f; + rename($eps_f.'.'.$i, $eps_f); + last; + } + my $anim_eps = $eps_f; + $anim_eps =~ s/(\.[^.]*)\.eps$/$1-$i\.eps/i; + if (-e $anim_eps) { + rename($anim_eps, $eps_f); last; } } - } + } + # imagemagick 6.2.0-6.2.7 fails to properly handle + # convert anim.gif anim.gif.eps + # it creates anim.eps instead. + if (not -e $eps_f) { + my $eps_f2 = $eps_f; + $eps_f2 =~ s/\.[^.]*\.eps$/\.eps/i; + if(-e $eps_f2) { + rename($eps_f2,$eps_f); + } + } + } } if ($advanced_role) { @@ -337,7 +354,10 @@ foreach $texfile (@texfile) { \%prog_state,$dvi_file); if ($tableofcontents eq 'yes') { &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null", - "for $status_statement now LaTeXing file for table of contents", + "for $status_statement First LaTeX of file for table of contents", + \%prog_state,$dvi_file); + &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null", + "for $status_statement Second LaTeX of file for table of contents", \%prog_state,$dvi_file); } #to create table of contents my $idxname=$name_file; @@ -455,6 +475,7 @@ foreach $texfile (@texfile) { "for $status_statement now Converting to PS", \%prog_state,$new_name_file); if (-e $new_name_file) { + &repaginate_postscript($new_name_file); print "

PDF output file (see link below)

\n"; $new_name_file =~ m/^(.*)\./; my $ps_file = my $tempo_file = $1.'temporar.ps'; @@ -529,6 +550,7 @@ foreach $texfile (@texfile) { "for $status_statement now Converting to PS", \%prog_state,$new_name_file); if (-e $new_name_file) { + &repaginate_postscript($new_name_file); print "
"; $new_name_file =~ m/^(.*)\./; my $ps_file = my $tempo_file = $1.'temporar.ps'; @@ -607,7 +629,7 @@ if ($number_of_files>1) { print "
A ZIP file of all the PDFs."; } if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); } - +print(&Apache::loncommon::end_page()); my $done; sub REAPER { $done=1; @@ -639,5 +661,127 @@ sub busy_wait_command { } +# Repagninate a postscript file. +# What we need to do: +# - Count the number of pages in each student. +# - Add pages between each student so that each student's output is +# the maximum number of pages. +# +sub repaginate_postscript { + + # We will try to do this in 2 passes through the postscript since + # the postscript is potentially large, to do 2 passes, the first pass + # must be able to calculate the total number of document pages so that + # at the beginning of the second pass we already know how to replace + # %%Pages: + + # Figure out + # 1. Number of pages in the document + # 2. Maximum number of pages in a student + # 3. Number of pages in each student. + + my ($postscript_filename) = @_; + open(PSFILE, "<$postscript_filename"); + my $line; + my $total_pages; # Total pages in document. + my $seen_pages = 0; # There are several %%Pages only the first is useful + my $student_number = 0; # Index of student we're working on. + my @pages_in_student; # For each student his/her initial page count. + my $max_pages = 0; # Pages in 'longest' student. + while ($line = ) { + my $page_number = 0; + + # Check for total pages (%%Pages:) + + if (($line =~ "^%%Pages:") && (!$seen_pages)) { + my @pageinfo = split(/ /,$line); + $total_pages = $pageinfo[1]; + $seen_pages = 1; + } + # Check for %%Page: n m $page_number will be the + # biggest of these until we see an endofstudent. + # Note that minipages generate spurious %Page: 1 1's so + # we only are looking for the largest n (n is page number at the + # bottom of the page, m the page number within the document. + # + if ($line =~ "^%%Page:") { + my @pageinfo = split(/ /, $line); + if ($page_number < $pageinfo[1]) { + $page_number = $pageinfo[1]; + } + } + # ENDOFSTUDENTSTAMP - save the page_number, reset and, if necessary + # udpate max_pages. + # + if ($line =~ "ENDOFSTUDENTSTAMP") { + $pages_in_student[$student_number] = $page_number; + $student_number++; + + if ($page_number > $max_pages) { + $max_pages = $page_number; + } + $page_number = 0; + + } + + + } + close(PSFILE); + + # Figure out how many total pages we need to add and adjust the + # $total_pages accordingly: + # + my $add_pages = 0; + for (my $i =0; $i < $student_number; $i++) { + $add_pages += ($max_pages - $pages_in_student[$i]); + } + # If we don't need to add any pages, we're done! + # You might think that we don't need to do anything if + # there are no pages to add, however we still need to at least strip out + # the ENDOFSTUDENTSTAMP stamps...as they are not postscript comments!! + + # Now pass 2; we're going to write the new. ps file: + # - Modify its first %%Pages: line so that it has the new correct number of + # pages + # - For each student, insert as many blank pages as needed (and + # associated structured comments) to expand a student out to + # max_pages pages. + # - Remove the ENDOFSTUDENTSTAMP lines. + # + + $total_pages += $add_pages; + $student_number = 0; + + open(PSFILE, "<$postscript_filename"); + open(PSOFILE,">$postscript_filename"."repaginating"); # unique if original fname is. + $seen_pages = 0; # Reset seen %%Pages flag... + while ($line = ) { + if (($line =~ "^%%Pages:") && (!$seen_pages)) { + $line = "%%Pages: $total_pages\n"; + $seen_pages = 1; + } + if ($line =~ "ENDOFSTUDENTSTAMP") { + $add_pages = ($max_pages - $pages_in_student[$student_number]); + $line = "\n"; + my $last_student_page = $pages_in_student[$student_number]; + my $last_total_page = $student_number*$max_pages + $last_student_page; + while ($add_pages) { + $line .= "%Page: $last_student_page $last_total_page\n"; + my $bop = $last_total_page-1; + $line .= "TeXDict begin $last_student_page $bop bop eop end\n"; + $last_student_page++; + $last_total_page++; + $add_pages--; + } + $student_number++; + } + print PSOFILE $line; + } + close PSOFILE; + close PSFILE; + + rename($postscript_filename."repaginating", $postscript_filename); + +}