--- loncom/interface/printout.pl 2005/07/05 10:23:35 1.83
+++ loncom/interface/printout.pl 2005/09/12 10:16:52 1.90
@@ -28,6 +28,7 @@
use lib '/home/httpd/lib/perl';
use LONCAPA::loncgi;
use File::Path;
+use File::Basename;
use IO::File;
use Image::Magick;
use Apache::lonhtmlcommon;
@@ -59,11 +60,11 @@ sub is_student {
# Debugging: Dump the environment for debugging.
#
sub dumpenv {
- print "
-------------------
";
+ print "
-------------------
";
foreach my $key (sort (keys %env)) {
- print "
$key -> $env{$key}";
+ print "
$key -> $env{$key}";
}
- print "
-------------------
";
+ print "
-------------------
";
}
#
@@ -113,7 +114,7 @@ sub send_error_mail {
if (&is_student( $courseid, $coursedom)) {
# build the subject and message body:
- # print "sending message to course coordinators.
";
+ # print "sending message to course coordinators.
";
# Todo: Convert badurl into a url from file path:
@@ -130,9 +131,9 @@ sub send_error_mail {
}
my (undef, %receivers) = &Apache::lonfeedback::decide_receiver(undef, 0,
1,1,1);
- # print "
sending...section: $env{'request.course.sec'}";
+ # print "
sending...section: $env{'request.course.sec'}";
foreach my $dest (keys %receivers) {
- # print "
dest is $dest";
+ # print "
dest is $dest";
my @destinfo = split(/:/,$dest);
my $user = $destinfo[0];
my $dom = $destinfo[1];
@@ -210,7 +211,8 @@ END
# print "$status_statement\n";
$not_eps=~s|\/\.\/|\/|g;
my $eps_f = $not_eps;
- $eps_f =~ s/\.[^.]*$/\.eps/i;
+ # $eps_f =~ s/\.[^.]*$/\.eps/i;
+ $eps_f .= '.eps'; # Just append the eps ext.
if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) {
$eps_f=~s/\/home\/([^\/]+)\/public_html/$1/;
$eps_f = '/home/httpd/prtspool/'.$eps_f;
@@ -261,7 +263,8 @@ 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;
}
}
@@ -271,6 +274,7 @@ 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'); }
print "
";
+my $num_files = @texfile;
foreach $texfile (@texfile) {
my $status_statement='';
my $link_text='download PDF';
@@ -278,30 +282,56 @@ 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(($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 ($adv) { &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);
@@ -341,7 +371,7 @@ foreach $texfile (@texfile) {
$badresource = substr($badtext, $whereitbegins+27,
length($badtext) - $whereitbegins - 48);
- # print "
failing resourcename: $badresource
";
+ # print "
failing resourcename: $badresource
";
}
}
@@ -350,7 +380,8 @@ foreach $texfile (@texfile) {
print "LaTeX could not successfully parse your tex file.
";
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
";
+ 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/^!/) {
@@ -364,7 +395,7 @@ foreach $texfile (@texfile) {
}
}
print "\n";
- # print "
Advanced role
";
+ # print "
Advanced role
";
print "The link to ";
$logfilename=~s/\/home\/httpd//;
print "Your log file ";
@@ -382,18 +413,24 @@ 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.
# $name_file - is the name of the LaTeX file.
# $identifier - is the unique LaTeX identifier.l
- print "
There are errors in $badtext";
- print "
These errors prevent this resource from printing correctly";
+ print "
There are errors in $badtext";
+ print "
These errors prevent this resource from printing correctly";
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//) {