--- loncom/interface/printout.pl	2004/12/20 21:15:20	1.71
+++ loncom/interface/printout.pl	2005/04/07 06:56:23	1.76
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.71 2004/12/20 21:15:20 albertel Exp $
+# $Id: printout.pl,v 1.76 2005/04/07 06:56:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,7 +27,7 @@
 #
 
 use lib '/home/httpd/lib/perl';
-use LONCAPA::loncgi();
+use LONCAPA::loncgi;
 use File::Path;
 use IO::File;
 use Image::Magick;
@@ -38,7 +38,6 @@ use Apache::lonlocal;
 
 use strict;
 $|=1;
-my %origENV=%ENV;
 if (! &LONCAPA::loncgi::check_cookie_and_load_env()) {
     print <<END;
 Content-type: text/html
@@ -58,34 +57,34 @@ END
  print $bodytag;
 
   my $identifier = $ENV{'QUERY_STRING'};
-  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 = &Apache::lonnet::unescape($ENV{'cgi.'.$identifier.'backref'});
+  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 $advanced_role = $env{'cgi.'.$identifier.'role'};
+  my $number_of_files = $env{'cgi.'.$identifier.'numberoffiles'}+1;
+  my $student_names = $env{'cgi.'.$identifier.'studentnames'};
+  my $backref = &Apache::lonnet::unescape($env{'cgi.'.$identifier.'backref'});
 
 
-  my $adv = $ENV{'request.role.adv'};
+  my $adv = $env{'request.role.adv'};
   
   my @names_pack=();
   if ($student_names=~/_END_/) {  
       @names_pack=split(/_ENDPERSON_/,$student_names);
   }
-  #got what we needed reset ENV in case it is to big for system
-  %ENV=%origENV;
 
   my $figfile = $texfile;
   $figfile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.dat/;
   my $duefile = $texfile;
   $duefile =~ s/^([^\.]+printout)[^t]+\.tex/$1\.due/;
   #do we have figures?
+  # print "Figure file: $figfile\n";
   if (-e $figfile) {
+      # print "$figfile exists\n";
       my %done_conversion;
       my $temporary_file=IO::File->new($figfile) || die "Couldn't open fig file $figfile for reading: $!\n";
       my @content_of_file = <$temporary_file>;
@@ -96,7 +95,9 @@ END
       foreach my $not_eps (@content_of_file) {
 	  chomp($not_eps);
 	  if ($not_eps ne '') {
+	      # print "Converting $not_eps"; # Debugging.
               my $status_statement='EPS picture for '.$not_eps;
+	      # print "$status_statement\n";
 	      $not_eps=~s|\/\.\/|\/|g;
 	      my $eps_f = $not_eps;
 	      $eps_f =~ s/\.[^.]*$/\.eps/i;
@@ -110,26 +111,24 @@ END
 		  $eps_f=~/$Apache::lonnet::perlvar{'lonUsersDir'}\/([^\/]+)\/\w\/\w\/\w\/(.+)/;
 		  $eps_f = '/home/httpd/prtspool/'.$1.'/'.$2;
 	      }
+	      $eps_f  =~ s/ /\_/g; # Spaces are problematic for system commands and LaTeX.
 	      my $path=$eps_f;
-	      $path=~s/\/([^\/]+)\.eps$//;
+	      $path =~ s/\/([^\/]+)\.eps$//;
+	      # print "Final file path: $path "; # Debugging
 	      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;
-	      }
+	      $not_eps =~ s/ /\\ /g;
+	      if ( exists($done_conversion{$not_eps})) { next; }
 	      if ($adv) {
 		  my $prettyname=$not_eps;
 		  $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;
 		  $prettyname=~s|$Apache::lonnet::perlvar{'lonDocRoot'}/|/|;
-		  &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Converting to EPS '.$prettyname); }
+		  &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Converting to EPS '.$prettyname);
+	      }
 	      $done_conversion{$not_eps}=1;
-	      my $status = $image->Read($not_eps);
-	      if ($status) {print "  $status  ";}
-	      $image->Set(page => '+100+200'); 
-	      $status = $image->Write($eps_f);	    
-	      if ($status) {print "  $status  ";}
+	      # print "Converting $not_eps -> $eps_f"; # Debugging
+	      system("convert $not_eps $eps_f");
               #check is eps exist in prtspool
               if(not -e $eps_f) {
 		  for (my $i=0;$i<10000;$i++) {
@@ -141,7 +140,9 @@ END
 	      }  
 	  }
       }
-      if ($adv) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
+      if ($adv) { 
+	  &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); 
+      }
       unlink($figfile);
   }
   #print "$texfile\n"; #name of the tex file for debugging only   
@@ -241,7 +242,7 @@ foreach $texfile (@texfile) {
 	      }  
 	  }
 	  print "</pre>\n";
-          if ($advans_role) {  
+          if ($advanced_role) {  
               print "<b><big>The link to ";
               $logfilename=~s/\/home\/httpd//;
 	      print "<a href=\"$logfilename\">Your log file </a></big></b>";
@@ -320,26 +321,26 @@ foreach $texfile (@texfile) {
 #	  unlink @garb;
 	      unlink $duefile;
 	      print "<a href=\"/prtspool/$pdf_file\">Your PDF document</a>";
-	      if ($advans_role) {  
-		  print "<br /><br />";
-		  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 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);
-		  $texfile =~ s/\.tex$/aaaaa\.html/;
-		  $tex_temporary_file = IO::File->new('>'.$texfile); 
-		  print $tex_temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_tex_file.'</pre></body></html>'."\n";
-		  print "<br /><br />";
-		  print "<b><big>The link to ";
-		  $texfile=~s/\/home\/httpd//;
-		  print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";
-		  print "\n";
-	      }
+	  }
+	  if ($advanced_role) {  
+	      print "<br /><br />";
+	      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 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);
+	      $texfile =~ s/\.tex$/aaaaa\.html/;
+	      $tex_temporary_file = IO::File->new('>'.$texfile); 
+	      print $tex_temporary_file '<html><head><title>LOGFILE</title></head><body><pre>'.$body_tex_file.'</pre></body></html>'."\n";
+	      print "<br /><br />";
+	      print "<b><big>The link to ";
+	      $texfile=~s/\/home\/httpd//;
+	      print "<a href=\"$texfile\">Your original LaTeX file </a></big></b>";
+	      print "\n";
 	  }
       } else {
 	  #LaTeX successfully parsed tex file