--- loncom/interface/printout.pl 2005/08/03 10:34:03 1.88
+++ loncom/interface/printout.pl 2006/04/08 07:06:35 1.96
@@ -41,19 +41,14 @@ 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";
@@ -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'}/|/|;
@@ -252,7 +250,7 @@ END
}
}
}
- if ($adv) {
+ if ($advanced_role) {
&Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state);
}
unlink($figfile);
@@ -271,8 +269,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) {
@@ -285,8 +282,7 @@ foreach $texfile (@texfile) {
my $name_range='';
if ($tempo_array[3]) {
$name=$tempo_array[3];
- my @full_names = split(/,/,$name); # split last name from others...
- $name_range = $full_names[0];
+ ($name_range) = split(/,/,$name, 2);
} else {
$name=$tempo_array[0].'@'.$tempo_array[1];
$name_range = $tempo_array[0];
@@ -299,8 +295,8 @@ foreach $texfile (@texfile) {
@tempo_array=split(/:/,$stud_info[-1]);
if ($tempo_array[3]) {
$name=$tempo_array[3];
- my @full_names = split(/,/, $name);
- $name_range .= "-".$full_names[0];
+ my ($lastname) = split(/,/, $name,2);
+ $name_range .= "-".$lastname;
} else {
$name=$tempo_array[0].'@'.$tempo_array[1];
$name_range .= '-'.$tempo_array[0];
@@ -317,7 +313,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.
#
@@ -338,7 +334,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;
@@ -382,6 +381,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/^!/) { @@ -413,6 +413,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. @@ -424,7 +427,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//) { @@ -600,7 +606,7 @@ 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); } my $done; sub REAPER { @@ -613,7 +619,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) { @@ -623,7 +629,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); }