--- loncom/interface/printout.pl 2005/09/12 10:16:52 1.90 +++ loncom/interface/printout.pl 2006/06/12 18:05:02 1.101 @@ -31,29 +31,24 @@ 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; -# # Determine if a user is operating as a student for this course/domain. -# -# #Parameters: -# course - The course id. -# cdom - The course domain. -# +# none #Implicit: # $env{request.role} contains the role under which this user operated this # this request. sub is_student { - return (! $env{'request.role.adv'}); + return ($env{'request.role'}=~/^st\./); } # @@ -112,7 +107,7 @@ sub send_error_mail { # The user is a student in the course: # - if (&is_student( $courseid, $coursedom)) { + if (&is_student()) { # build the subject and message body: # print "sending message to course coordinators.
"; @@ -121,7 +116,9 @@ sub send_error_mail { my $subject = "Error [$badurl] Print failed for $user".'@'.$domain; my $message .= "Print failed to render LaTeX for $user".'@'."$domain\n"; $message .= " User was attempting to print: \n"; - $message .= " $resources\n"; + foreach my $resource (split(/:/,$resources)) { + $message .= " $resource\n"; + } $message .= "--------------------LaTeX logfile:------------ \n"; $message .= $logfile; $message .= "-----------------LaTeX source file: ------------\n"; @@ -164,8 +161,8 @@ 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'}; @@ -180,14 +177,14 @@ END my $student_names = $env{'cgi.'.$identifier.'.studentnames'}; my $backref = &Apache::lonnet::unescape($env{'cgi.'.$identifier.'.backref'}); - - my $adv = $env{'request.role.adv'}; my @names_pack=(); if ($student_names=~/_END_/) { @names_pack=split(/_ENDPERSON_/,$student_names); } +print "Return to last resource.

"; + my $figfile = $texfile; $figfile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.dat/; my $duefile = $texfile; @@ -202,7 +199,8 @@ END close $temporary_file; my $noteps; my %prog_state; - if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Coverting Images to EPS','Picture Conversion Status',$#content_of_file,'inline','80'); } + if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Coverting Images to EPS','Picture Conversion Status',$#content_of_file,'inline','80'); } + print('
'); foreach my $not_eps (@content_of_file) { chomp($not_eps); if ($not_eps ne '') { @@ -232,7 +230,7 @@ END $not_eps =~ s/\s+$//; $not_eps =~ s/ /\\ /g; if ( exists($done_conversion{$not_eps})) { next; } - if ($adv) { + if ($advanced_role) { my $prettyname=$not_eps; $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|; $prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|; @@ -241,18 +239,39 @@ END $done_conversion{$not_eps}=1; # print "Converting $not_eps -> $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 ($adv) { + if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); } unlink($figfile); @@ -271,8 +290,7 @@ END my $ind=-1; my %prog_state; -print "Return to last resource.

"; -if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); } +if ($advanced_role) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); } print "
"; my $num_files = @texfile; foreach $texfile (@texfile) { @@ -316,7 +334,7 @@ foreach $texfile (@texfile) { } $name_range =~ s/'//g; # O'Neil -> ONeil e.g. print "
"; - if ($adv) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); } + if ($advanced_role) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); } # This little piece of dirt puts username ranges into the original tex # Tex filename from which they'll propagate into the other filenames as well. # @@ -337,7 +355,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 +476,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 +551,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'; @@ -606,8 +629,8 @@ if ($number_of_files>1) { $zipfile=~s/\/home\/httpd//; print "
A ZIP file of all the PDFs."; } -if ($adv) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); } - +if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); } +print(&Apache::loncommon::end_page()); my $done; sub REAPER { $done=1; @@ -618,8 +641,9 @@ sub busy_wait_command { $SIG{CHLD} = \&REAPER; $done=0; + print("

Doing : $command"); my $pid=open(CMD,"$command |"); - if ($adv) { + if ($advanced_role) { &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message); } while(!$done) { @@ -629,7 +653,7 @@ sub busy_wait_command { my $size=(stat($output_file))[7]; $extra_msg=", $size bytes generated"; } - if ($adv) { + if ($advanced_role) { &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win, $message.$extra_msg); } @@ -637,7 +661,129 @@ sub busy_wait_command { $SIG{CHLD}='IGNORE'; close(CMD); } + print("

End

"); +# 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); + +}