--- loncom/interface/printout.pl 2005/03/14 23:51:20 1.73
+++ 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.73 2005/03/14 23:51:20 foxr 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'});
@@ -114,12 +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;
@@ -141,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
@@ -241,7 +245,7 @@ foreach $texfile (@texfile) {
}
}
print "\n";
- if ($advans_role) {
+ if ($advanced_role) {
print "The link to ";
$logfilename=~s/\/home\/httpd//;
print "Your log file ";
@@ -320,26 +324,26 @@ foreach $texfile (@texfile) {
# unlink @garb;
unlink $duefile;
print "Your PDF document";
- if ($advans_role) {
- print "
";
- print "The link to ";
- $logfilename=~s/\/home\/httpd//;
- print "Your log file ";
- 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 '
'.$body_tex_file.''."\n"; - print "
'.$body_tex_file.''."\n"; + print "