--- loncom/interface/printout.pl 2004/04/01 15:31:06 1.53
+++ loncom/interface/printout.pl 2004/05/12 18:44:50 1.58
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
#
-# $Id: printout.pl,v 1.53 2004/04/01 15:31:06 albertel Exp $
+# $Id: printout.pl,v 1.58 2004/05/12 18:44:50 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -89,7 +89,7 @@ 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'); }
+ 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) {
chomp($not_eps);
if ($not_eps ne '') {
@@ -100,9 +100,12 @@ 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$//;
@@ -116,7 +119,7 @@ END
if ($adv) {
my $prettyname=$not_eps;
$prettyname=~s|/home/([^/]+)/public_html|/priv/$1|;
- $prettyname=~s|/home/httpd/html/|/|;
+ $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);
@@ -151,8 +154,8 @@ END
my $ind=-1;
my %prog_state;
-if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline'); }
-my $final_statement="Return to last resource.
Generated PDF File for:
";
+if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','75'); }
+my $final_statement="Return to last resource.
Generated PDF File for:
";
foreach $texfile (@texfile) {
my $status_statement='';
my $link_text='download PDF';