--- loncom/interface/printout.pl	2004/05/06 06:45:13	1.55
+++ loncom/interface/printout.pl	2005/02/03 21:37:48	1.72
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.55 2004/05/06 06:45:13 albertel Exp $
+# $Id: printout.pl,v 1.72 2005/02/03 21:37:48 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,15 +27,16 @@
 #
 
 use lib '/home/httpd/lib/perl';
-use Time::Local;
 use LONCAPA::loncgi();
 use File::Path;
 use IO::File;
 use Image::Magick;
 use Apache::lonhtmlcommon;
+use Apache::lonnet();
 use Apache::loncommon;
 use Apache::lonlocal;
 
+use strict;
 $|=1;
 my %origENV=%ENV;
 if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {
@@ -60,13 +61,15 @@ END
   my $texfile = $ENV{'cgi.'.$identifier.'.file'};
   my $laystyle = $ENV{'cgi.'.$identifier.'.layout'};
   my $numberofcolumns = $ENV{'cgi.'.$identifier.'.numcol'};
+  my $paper = $ENV{'cgi.'.$identifier.'.paper'};
   my $selectionmade = $ENV{'cgi.'.$identifier.'.selection'};
   my $tableofcontents = $ENV{'cgi.'.$identifier.'tableofcontents'};
   my $tableofindex = $ENV{'cgi.'.$identifier.'tableofindex'};
   my $advans_role = $ENV{'cgi.'.$identifier.'role'};
   my $number_of_files = $ENV{'cgi.'.$identifier.'numberoffiles'}+1;
   my $student_names = $ENV{'cgi.'.$identifier.'studentnames'};
-  my $backref = $ENV{'cgi.'.$identifier.'backref'};
+  my $backref = &Apache::lonnet::unescape($ENV{'cgi.'.$identifier.'backref'});
+
 
   my $adv = $ENV{'request.role.adv'};
   
@@ -84,13 +87,13 @@ END
   #do we have figures?
   if (-e $figfile) {
       my %done_conversion;
-      my $temporary_file=IO::File->new($figfile) || die "Couldn't open file for reading: $!\n";
+      my $temporary_file=IO::File->new($figfile) || die "Couldn't open fig file $figfile for reading: $!\n";
       my @content_of_file = <$temporary_file>;
       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','75');  }
-      foreach $not_eps (@content_of_file) {
+      if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Coverting Images to EPS','Picture Conversion Status',$#content_of_file,'inline','80');  }
+      foreach my $not_eps (@content_of_file) {
 	  chomp($not_eps);
 	  if ($not_eps ne '') {
               my $status_statement='EPS picture for '.$not_eps;
@@ -100,30 +103,27 @@ END
 	      if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) {
                   $eps_f=~s/\/home\/([^\/]+)\/public_html/$1/;
 		  $eps_f = '/home/httpd/prtspool/'.$eps_f;
-	      } else {
-		  $eps_f=~m/\/home\/httpd\/html\/res\/(.+)/;
+	      } elsif ($eps_f=~/$Apache::lonnet::perlvar{'lonDocRoot'}\/res\//) {
+		  $eps_f=~m/$Apache::lonnet::perlvar{'lonDocRoot'}\/res\/(.+)/;
 		  $eps_f = '/home/httpd/prtspool/'.$1;
+	      } elsif ($eps_f=~/$Apache::lonnet::perlvar{'lonUsersDir'}\//) {
+		  $eps_f=~/$Apache::lonnet::perlvar{'lonUsersDir'}\/([^\/]+)\/\w\/\w\/\w\/(.+)/;
+		  $eps_f = '/home/httpd/prtspool/'.$1.'/'.$2;
 	      }
 	      my $path=$eps_f;
 	      $path=~s/\/([^\/]+)\.eps$//;
 	      File::Path::mkpath($path,0,0777);
-	      my $image = Image::Magick->new;
 	      $not_eps =~ s/^\s+//;
 	      $not_eps =~ s/\s+$//;
-	      if ( exists($done_conversion{$not_eps})) {
-		  next;
-	      }
+	      if ( exists($done_conversion{$not_eps})) { next; }
 	      if ($adv) {
 		  my $prettyname=$not_eps;
 		  $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;
-		  $prettyname=~s|/home/httpd/html/|/|;
-		  &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Converting to EPS '.$prettyname); }
+		  $prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|;
+		  &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Converting to EPS '.$prettyname);
+	      }
 	      $done_conversion{$not_eps}=1;
-	      $status = $image->Read($not_eps);
-	      if ($status) {print "  $status  ";}
-	      $image->Set(page => '+100+200'); 
-	      $status = $image->Write($eps_f);	    
-	      if ($status) {print "  $status  ";}
+	      system("convert $not_eps $eps_f");
               #check is eps exist in prtspool
               if(not -e $eps_f) {
 		  for (my $i=0;$i<10000;$i++) {
@@ -151,8 +151,9 @@ END
 
 my $ind=-1;
 my %prog_state;
-if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','75'); }
-my $final_statement="<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />Generated PDF File for:<br />";
+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 />";
 foreach $texfile (@texfile) {
   my $status_statement='';
   my $link_text='download PDF';
@@ -165,7 +166,7 @@ foreach $texfile (@texfile) {
   } else {
       $name=$tempo_array[0].'@'.$tempo_array[1];
   }
-  $link_text='<b>'.$name.'</b> ';
+  $link_text='<b>'.$name.'</b>';
   $status_statement.=$name;
   if ($#stud_info>0) {
       @tempo_array=split(/:/,$stud_info[-1]);
@@ -174,7 +175,7 @@ foreach $texfile (@texfile) {
       } else {
 	  $name=$tempo_array[0].'@'.$tempo_array[1];
       }
-      $link_text.='- <b>'.$name.':</b>  ';
+      $link_text.=' - <b>'.$name.'</b>';
       $status_statement.=' -  '.$name;
   } 
   if ($adv) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); }
@@ -183,20 +184,28 @@ foreach $texfile (@texfile) {
       my $name_file = $2;
       my $path_file = $1.'/';
       chdir $path_file;
-      system("latex $name_file 1>/dev/null 2>/dev/null");
+      my $dvi_file= $name_file; $dvi_file =~ s/\.tex/\.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') {
-	  system("latex $name_file 1>/dev/null 2>/dev/null");
+      &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null",
+			 "for $status_statement now LaTeXing file for table of contents",
+			 \%prog_state,$dvi_file);
       } #to create table of contents
       my $idxname=$name_file;
       $idxname=~s/\.tex$/\.idx/;
       if ($tableofindex eq 'yes') {
-	  system("makeindex $idxname");
-	  system("latex $name_file 1>/dev/null 2>/dev/null");
+	  &busy_wait_command("makeindex $idxname",
+			     "making index file",
+			     \%prog_state,$idxname);
+	  &busy_wait_command("latex $name_file 1>/dev/null 2>/dev/null",
+			     "for $status_statement now LaTeXing file for index section",
+			     \%prog_state,$dvi_file);
       } #to create index
       #Do we have a latex error in the log file?
-      my $logfilename = $texfile;
-      $logfilename =~ s/\.tex$/\.log/;
-      my $temporary_file=IO::File->new($logfilename) || die "Couldn't open file for reading: $!\n";
+      my $logfilename = $texfile; $logfilename =~ s/\.tex$/\.log/;
+      my $temporary_file=IO::File->new($logfilename) || die "Couldn't open log file $logfilename for reading: $!\n";
       my @content_of_file = <$temporary_file>;
       close $temporary_file; 
       my $body_log_file = join(' ',@content_of_file);
@@ -212,7 +221,7 @@ foreach $texfile (@texfile) {
 	  if ($whereitbegins!=-1 and $whereitends!=-1) {
  	      print "With very high probability this error occured in ".substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26)."<br /><br />";
 	  }
-	  print "Here are the error messages in the LaTeX log file</br><br />";
+	  print "Here are the error messages in the LaTeX log file</br><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/^!/) {
@@ -222,16 +231,17 @@ foreach $texfile (@texfile) {
 		  $sygnal = 0;
 	      } 
 	      if ($sygnal) {
-		  print "$content_of_file[$i]<br />";
+		  print "$content_of_file[$i]";
 	      }  
 	  }
+	  print "</pre>\n";
           if ($advans_role) {  
               print "<b><big>The link to ";
               $logfilename=~s/\/home\/httpd//;
 	      print "<a href=\"$logfilename\">Your log file </a></big></b>";
 	      print "\n";
               #link tooriginal LaTeX file (included according Michael Hamlin desire)
-	      my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open file for reading: $!\n";
+	      my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n";
 	      my @tex_content_of_file = <$tex_temporary_file>;
 	      close $tex_temporary_file; 
 	      my $body_tex_file = join(' ',@tex_content_of_file);
@@ -247,7 +257,7 @@ foreach $texfile (@texfile) {
 
       } elsif ($body_log_file=~m/<inserted text>/) {
 	  my $whereitbegins = index $body_log_file,'<inserted text>';
-	  print "You are running LaTeX in the <b>batch mode</b>.";
+	  print "You are running LaTeX in <b>batch mode</b>.";
 	  while ($whereitbegins != -1) {
 	      my $tempobegin=$whereitbegins;
 	      $whereitbegins = rindex $body_log_file,'STAMPOFPASSEDRESOURCESTART',$whereitbegins;
@@ -259,24 +269,39 @@ foreach $texfile (@texfile) {
 	  $name_file =~ s/\.tex/\.dvi/;
 	  my $new_name_file = $name_file;
 	  $new_name_file =~ s/\.dvi/\.ps/;
-	  my $comma = "dvips -Ppdf -G0 -o $new_name_file";
-	  system("$comma $name_file 1>/dev/null 2>/dev/null");
+	  my $papera=$paper;
+	  if ($papera eq 'letter') {$papera='';}
+	  if ($papera ne '') {$papera='-t'.$papera;}
+	  my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file";
+	  &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
+			     "for $status_statement now Converting to PS",
+			     \%prog_state,$new_name_file);
 	  if (-e $new_name_file) {
 	      print "<h1>PDF output file (see link below)</h1>\n";
 	      $new_name_file =~ m/^(.*)\./;
-	      my $tempo_file = $1.'temporar.ps';
-	      my $name_file = $1.'.pdf';
+	      my $ps_file = my $tempo_file = $1.'temporar.ps';
+	      my $pdf_file = $1.'.pdf';
 	      if ($laystyle eq 'album' and $numberofcolumns eq '2') {
 		  $comma = "psnup -2 -s1.0 $new_name_file";
-		  system("$comma $tempo_file 1>/dev/null 2>/dev/null"); 
-		  system("ps2pdf $tempo_file $name_file 1>/dev/null 2>/dev/null");
+		  &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
+				     "for $status_statement now Modifying PS layout",
+				     \%prog_state,$tempo_file); 
 	      } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
-		  $comma = 'pstops -pletter "2:0+1(0.48w,0)"';
-		  system("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null");
-		  system("ps2pdf $tempo_file $name_file 1>/dev/null 2>/dev/null");
+		  my $papera=$paper;
+                  if ($papera eq 'letter') {$papera='';}
+		  if ($papera ne '') {$papera='-p'.$papera;}
+		  $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"';
+		  &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",
+				     "for $status_statement now Modifying PS layout",
+				     \%prog_state,$tempo_file); 
+
 	      } else {
-		  system("ps2pdf $new_name_file $name_file 1>/dev/null 2>/dev/null");
+		  $ps_file=$new_name_file;
 	      }	    
+	      &busy_wait_command("ps2pdf $ps_file $pdf_file 1>/dev/null 2>/dev/null",
+				 "for $status_statement now Converting PS to PDF",
+				 \%prog_state, $pdf_file);
+
 	      my $texlog = $texfile;
 	      my $texaux = $texfile;
 	      my $texdvi = $texfile;
@@ -288,7 +313,7 @@ foreach $texfile (@texfile) {
 	      my @garb = ($texaux,$texdvi,$texps);
 #	  unlink @garb;
 	      unlink $duefile;
-	      print "<a href=\"/prtspool/$name_file\">Your PDF document</a>";
+	      print "<a href=\"/prtspool/$pdf_file\">Your PDF document</a>";
 	      if ($advans_role) {  
 		  print "<br /><br />";
 		  print "<b><big>The link to ";
@@ -296,7 +321,7 @@ foreach $texfile (@texfile) {
 		  print "<a href=\"$logfilename\">Your log file </a></big></b>";
 		  print "\n";
 		  #link tooriginal LaTeX file (included according Michael Hamlin desire)
-		  my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open file for reading: $!\n";
+		  my $tex_temporary_file=IO::File->new($texfile) || die "Couldn't open tex file $texfile for reading: $!\n";
 		  my @tex_content_of_file = <$tex_temporary_file>;
 		  close $tex_temporary_file; 
 		  my $body_tex_file = join(' ',@tex_content_of_file);
@@ -315,25 +340,57 @@ foreach $texfile (@texfile) {
 	  $name_file =~ s/\.tex/\.dvi/;
 	  my $new_name_file = $name_file;
 	  $new_name_file =~ s/\.dvi/\.ps/;
-	  my $comma = "dvips -Ppdf -G0 -o $new_name_file";
-	  system("$comma $name_file 1>/dev/null 2>/dev/null");
+	  my $papera=$paper;
+	  if ($papera eq 'letter') {$papera='';}
+	  if ($papera ne '') {$papera='-t'.$papera;}
+	  my $comma = "dvips $papera -Ppdf -G0 -o $new_name_file";
+	  &busy_wait_command("$comma $name_file 1>/dev/null 2>/dev/null",
+			     "for $status_statement now Converting to PS",
+			     \%prog_state,$new_name_file);
 	  if (-e $new_name_file) {
-	      print "<br />$final_statement ";
-	      $final_statement='';
+	      print "<br />";
 	      $new_name_file =~ m/^(.*)\./;
-	      my $tempo_file = $1.'temporar.ps';
-	      my $name_file = $1.'.pdf';
+	      my $ps_file = my $tempo_file = $1.'temporar.ps';
+	      my $pdf_file = $1.'.pdf';
 	      if ($laystyle eq 'album' and $numberofcolumns eq '2') {
 		  $comma = "psnup -2 -s1.0 $new_name_file";
-		  system("$comma $tempo_file 1>/dev/null 2>/dev/null"); 
-		  system("ps2pdf $tempo_file $name_file 1>/dev/null 2>/dev/null");
+		  &busy_wait_command("$comma $tempo_file 1>/dev/null 2>/dev/null",
+				     "for $status_statement now Modifying PS layout",
+				     \%prog_state,$tempo_file);
 	      } elsif ($laystyle eq 'book' and $numberofcolumns eq '2') {
-		  $comma = 'pstops -pletter "2:0+1(0.48w,0)"';
-		  system("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null");
-		  system("ps2pdf $tempo_file $name_file 1>/dev/null 2>/dev/null");
+		  $papera=~s/t/p/;
+		  $comma = 'pstops '.$papera.' "2:0+1(0.48w,0)"';
+		  &busy_wait_command("$comma $new_name_file $tempo_file 1>/dev/null 2>/dev/null",
+				     "for $status_statement now Modifying PS layout",
+				     \%prog_state,$tempo_file); 
 	      } else {
-		  system("ps2pdf $new_name_file $name_file 1>/dev/null 2>/dev/null");
-	      }	    
+		  $ps_file=$new_name_file;
+	      }
+	      my $addtoPSfile={'legal'=>'<< /PageSize [612 1008] >> setpagedevice',
+                               'tabloid'=>'<< /PageSize [792 1224] >> setpagedevice',
+                               'executive'=>,'<< /PageSize [540 720] >> setpagedevice',
+                               'a2'=>'<< /PageSize [1195.02 1690.09] >> setpagedevice',
+                               'a3'=>'<< /PageSize [842 1195.02] >> setpagedevice',
+                               'a4'=>'<< /PageSize [595.2 842] >> setpagedevice',
+                               'a5'=>'<< /PageSize [421.1 595.2] >> setpagedevice',
+                               'a6'=>'<< /PageSize [298.75 421.1] >> setpagedevice',
+			   };
+	      if ($paper ne 'letter') {
+		  open(FFH,'<',$ps_file) || die "Couldn't open ps file $ps_file for reading: $!\n";
+		  my $new_ps_file='new'.$ps_file;
+		  open(FFHS,'>',$new_ps_file) || die "Couldn't open new ps file $new_ps_file for reading: $!\n";
+		  print FFHS $addtoPSfile->{$paper}."\n";
+		  while (<FFH>) {
+		      print FFHS $_;
+		  }
+		  close(FFH);
+		  close(FFHS);
+		  $ps_file=$new_ps_file;	  
+	      }
+	      &busy_wait_command("ps2pdf $ps_file $pdf_file 1>/dev/null 2>/dev/null",
+				 "for $status_statement now Converting PS to PDF",
+				 \%prog_state,$pdf_file);
+	    
 	      my $texlog = $texfile;
 	      my $texaux = $texfile;
 	      my $texdvi = $texfile;
@@ -345,10 +402,10 @@ foreach $texfile (@texfile) {
 	      my @garb = ($texlog,$texaux,$texdvi,$texps);
 #	  unlink @garb;
 	      unlink $duefile;
-	      print "<a href=\"/prtspool/$name_file\">$link_text</a>";
+	      print "<a href=\"/prtspool/$pdf_file\">$link_text - click here to download pdf</a>";
 	      print "\n";
 	  }
-      }
+      }  
   } else {
       print "LaTeX file $texfile was not created successfully";
   }
@@ -370,6 +427,35 @@ if ($number_of_files>1) {
 }
 if ($adv) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
 
+my $done;
+sub REAPER {
+    $done=1;
+}
+
+sub busy_wait_command {
+    my ($command,$message,$progress_win,$output_file)=@_;
+    
+    $SIG{CHLD} = \&REAPER;
+    $done=0;
+    my $pid=open(CMD,"$command |");
+    if ($adv) {
+	&Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,$message);
+    }
+    while(!$done) {
+	sleep 1;
+	my $extra_msg;
+	if ($output_file) {
+	    my $size=(stat($output_file))[7];
+	    $extra_msg=", $size bytes generated";
+	}
+	if ($adv) {
+	    &Apache::lonhtmlcommon::Update_PrgWin('',$progress_win,
+						  $message.$extra_msg);
+	}
+    }
+    $SIG{CHLD}='IGNORE';
+    close(CMD);
+}