--- loncom/interface/printout.pl	2005/08/04 21:26:23	1.89
+++ loncom/interface/printout.pl	2006/04/24 21:30:06	1.98
@@ -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.<br />";
 
@@ -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,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'};
@@ -180,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 "<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />";
+
   my $figfile = $texfile;
   $figfile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.dat/;
   my $duefile = $texfile;
@@ -202,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('<br />');
       foreach my $not_eps (@content_of_file) {
 	  chomp($not_eps);
 	  if ($not_eps ne '') {
@@ -232,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'}/|/|;
@@ -241,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);
@@ -271,8 +289,7 @@ END
 
 my $ind=-1;
 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'); }
+if ($advanced_role) { %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) {
@@ -316,7 +333,7 @@ foreach $texfile (@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); }
+  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 +354,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;
@@ -381,6 +401,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/^!/) {
@@ -412,6 +433,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.
@@ -423,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 "<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>/) {
@@ -599,8 +626,8 @@ if ($number_of_files>1) {
     $zipfile=~s/\/home\/httpd//;
     print "<br /> A <a href=\"$zipfile\">ZIP file</a> 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;
@@ -612,7 +639,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) {
@@ -622,7 +649,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);
 	}