--- loncom/interface/printout.pl	2005/02/03 21:37:48	1.72
+++ loncom/interface/printout.pl	2005/03/23 22:37:46	1.75
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.72 2005/02/03 21:37:48 albertel Exp $
+# $Id: printout.pl,v 1.75 2005/03/23 22:37:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,7 +65,7 @@ END
   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 $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'});
@@ -85,7 +85,9 @@ END
   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 +98,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,11 +114,14 @@ 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);
 	      $not_eps =~ s/^\s+//;
 	      $not_eps =~ s/\s+$//;
+	      $not_eps =~ s/ /\\ /g;
 	      if ( exists($done_conversion{$not_eps})) { next; }
 	      if ($adv) {
 		  my $prettyname=$not_eps;
@@ -123,6 +130,7 @@ END
 		  &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Converting to EPS '.$prettyname);
 	      }
 	      $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) {
@@ -135,7 +143,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   
@@ -235,7 +245,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>";
@@ -314,26 +324,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