--- loncom/interface/printout.pl	2005/07/22 11:42:50	1.85
+++ loncom/interface/printout.pl	2005/09/16 19:36:08	1.91
@@ -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;
@@ -120,7 +121,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";
@@ -262,7 +265,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;
       } 
   }
@@ -272,6 +276,7 @@ my %prog_state;
 print "<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />";
 if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); }
 print "<br />";
+my $num_files = @texfile;
 foreach $texfile (@texfile) {
   my $status_statement='';
   my $link_text='download PDF';
@@ -279,30 +284,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='<b>'.$name.'</b>';
+      $status_statement.=$name;
   }
-  $link_text='<b>'.$name.'</b>';
-  $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];
       }
-      $link_text.=' - <b>'.$name.'</b>';
-      $status_statement.=' -  '.$name;
-  } 
+      if (($name ne "") && ($name ne '@')) {
+	  $link_text.=' - <b>'.$name.'</b>';
+	  $status_statement.=' -  '.$name;
+  
+      }
+  }
+  if(($num_files > 1) && ($link_text eq 'download PDF')) { # Printing codes
+      $link_text = '<b>'.basename($texfile,'.tex').'.pdf</b>';
+      $status_statement .= basename($texfile);
+  }
+  $name_range =~ s/'//g;	# O'Neil -> ONeil e.g.
+  print "<br/>";
   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);
@@ -352,6 +383,7 @@ foreach $texfile (@texfile) {
 	      print "It probably has errors in it.<br />";
 	      print "With very high probability this error occured in ".$badtext."<br /><br />";
 	      print "Here are the error messages in the LaTeX log file<br /><pre>";
+
 	      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 +415,9 @@ foreach $texfile (@texfile) {
 	      $texfile=~s/\/home\/httpd//;
 	      print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";
 	      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 +429,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 "<br />A message has been sent to the instructor describing this failure<br />"
+	      print "<br />A message has been sent to the instructor describing this failure<br />";
+	      my $help_text = &Apache::loncommon::help_open_topic("Print_Resource", "Help on printing");
+	      print  ("$help_text");
+
 	  }
 
       } elsif ($body_log_file=~m/<inserted text>/) {