--- loncom/interface/printout.pl 2011/05/18 11:26:44 1.149 +++ loncom/interface/printout.pl 2011/10/26 02:09:42 1.150 @@ -1,7 +1,7 @@ #!/usr/bin/perl # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc. # -# $Id: printout.pl,v 1.149 2011/05/18 11:26:44 foxr Exp $ +# $Id: printout.pl,v 1.150 2011/10/26 02:09:42 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -897,8 +897,8 @@ sub convert_figure { my $status_statement='EPS picture for '.$not_eps; my $eps_f = $not_eps; - if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) { - $eps_f=~s/\/home\/([^\/]+)\/public_html/$1/; + if ($eps_f=~/\/home\/httpd\/html\/priv\/[^\/]+\/([^\/]+)\//) { + $eps_f=~s/\/home\/httpd\/html\/priv\/[^\/]+\/([^\/]+)/$1/; } elsif ($eps_f=~/$perlvar{'lonDocRoot'}\/res\//) { $eps_f=~ s/$perlvar{'lonDocRoot'}\/res\/(.+)/$1/; } elsif ($eps_f=~/$perlvar{'lonUsersDir'}\//) { @@ -931,7 +931,6 @@ sub convert_figure { $not_eps =~ s/ /\\ /g; my $prettyname=$not_eps; if ($advanced_role) { - $prettyname=~s|/home/([^/]+)/public_html|/priv/$1|; $prettyname=~s|$perlvar{'lonDocRoot'}/|/|; &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state, 'Converting to EPS '.$prettyname);