--- loncom/interface/printout.pl 2005/07/22 11:42:50 1.85
+++ loncom/interface/printout.pl 2006/06/06 11:04:18 1.99
@@ -28,31 +28,27 @@
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;
-#
# 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\./);
}
#
@@ -111,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.
";
@@ -120,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";
@@ -163,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'};
@@ -179,14 +176,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;
@@ -201,7 +198,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 '') {
@@ -231,7 +229,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'}/|/|;
@@ -240,18 +238,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);
@@ -262,16 +281,17 @@ END
@texfile=();
for (my $i=1;$i<=$number_of_files;$i++) {
my $new_texfile=$texfile;
- $new_texfile=~s/\.tex/_$i\.tex/;
+ $new_texfile=~s/\.tex//;
+ $new_texfile = sprintf("%s_%03d.tex", $new_texfile,$i);
push @texfile,$new_texfile;
}
}
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) {
my $status_statement='';
my $link_text='download PDF';
@@ -279,36 +299,65 @@ foreach $texfile (@texfile) {
my @stud_info=split(/_END_/,$names_pack[$ind]);
my @tempo_array=split(/:/,$stud_info[0]);
my $name;
+ my $name_range='';
if ($tempo_array[3]) {
$name=$tempo_array[3];
+ ($name_range) = split(/,/,$name, 2);
} else {
$name=$tempo_array[0].'@'.$tempo_array[1];
+ $name_range = $tempo_array[0];
+ }
+ if (($name ne "") && ($name ne '@') ) { # Could be printing codes...
+ $link_text=''.$name.'';
+ $status_statement.=$name;
}
- $link_text=''.$name.'';
- $status_statement.=$name;
if ($#stud_info>0) {
@tempo_array=split(/:/,$stud_info[-1]);
if ($tempo_array[3]) {
$name=$tempo_array[3];
+ my ($lastname) = split(/,/, $name,2);
+ $name_range .= "-".$lastname;
} else {
$name=$tempo_array[0].'@'.$tempo_array[1];
+ $name_range .= '-'.$tempo_array[0];
+ }
+ if (($name ne "") && ($name ne '@')) {
+ $link_text.=' - '.$name.'';
+ $status_statement.=' - '.$name;
+
}
- $link_text.=' - '.$name.'';
- $status_statement.=' - '.$name;
- }
- if ($adv) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); }
+ }
+ if(($num_files > 1) && ($link_text eq 'download PDF')) { # Printing codes
+ $link_text = ''.basename($texfile,'.tex').'.pdf';
+ $status_statement .= basename($texfile);
+ }
+ $name_range =~ s/'//g; # O'Neil -> ONeil e.g.
+ print "
";
+ 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.
+ #
if (-e $texfile) {
+ if (($name_range ne '') && ($num_files > 1)) {
+ my $newtexfile = $texfile;
+ $newtexfile =~ s/\.tex/$name_range\.tex/;
+ rename($texfile, $newtexfile);
+ $texfile = $newtexfile;
+ }
$texfile =~ m/^(.*)\/([^\/]+)$/;
my $name_file = $2;
my $path_file = $1.'/';
chdir $path_file;
- my $dvi_file= $name_file; $dvi_file =~ s/\.tex/\.dvi/;
+ my $dvi_file= $name_file; $dvi_file =~ s/\.tex/$name_range\.dvi/;
&busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null",
"for $status_statement now LaTeXing file",
\%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;
@@ -352,6 +401,7 @@ foreach $texfile (@texfile) {
print "It probably has errors in it.
";
print "With very high probability this error occured in ".$badtext."
";
print "Here are the error messages in the LaTeX log file
"; + my $sygnal = 0; for (my $i=0;$i<=$#content_of_file;$i++) { if ($content_of_file[$i]=~m/^Runaway argument?/ or $content_of_file[$i]=~m/^!/) { @@ -383,6 +433,9 @@ foreach $texfile (@texfile) { $texfile=~s/\/home\/httpd//; print "Your original LaTeX file "; print "\n"; + my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", "Help on printing"); + print ("$help_text"); + } else { # Student role... # at this point: # $body_log_file - contains the log file. @@ -394,7 +447,10 @@ foreach $texfile (@texfile) { my $tex_handle = IO::File->new($name_file); my @tex_contents = <$tex_handle>; &send_error_mail($identifier, $badresource, $body_log_file, \@tex_contents); - print "
A message has been sent to the instructor describing this failure
" + print "
A message has been sent to the instructor describing this failure
"; + my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", "Help on printing"); + print ("$help_text"); + } } elsif ($body_log_file=~m//) { @@ -419,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'; @@ -493,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'; @@ -570,8 +628,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; @@ -583,7 +641,7 @@ sub busy_wait_command { $SIG{CHLD} = \&REAPER; $done=0; my $pid=open(CMD,"$command |"); - if ($adv) { + if ($advanced_role) { &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message); } while(!$done) { @@ -593,7 +651,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); } @@ -603,5 +661,27 @@ 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 { + # For now just strip out the STARTOFSTUDENTSTAMP + # ENDOFSTUDENTSTAMP markers in the postscript. + + my ($postscript_filename) = @_; + open(PSFILE, "<$postscript_filename"); + my @psfilelines =; + close(PSFILE); + my $psbody = join('', @psfilelines); + $psbody =~ s/STARTOFSTUDENTSTAMP//g; + $psbody =~ s/ENDOFSTUDENTSTAMP//g; + + open(PSFILE, ">$postscript_filename"); + print PSFILE $psbody; + close PSFILE; +}