loncom/interface/printout.pl - diff

Return to printout.pl CVS log

Up to [LON-CAPA] / loncom / interface

version 1.149, 2011/05/18 11:26:44	version 1.150, 2011/10/26 02:09:42
Line 897 sub convert_figure {	Line 897 sub convert_figure {
my $status_statement='EPS picture for '.$not_eps;	my $status_statement='EPS picture for '.$not_eps;
my $eps_f = $not_eps;	my $eps_f = $not_eps;

if ($eps_f=~/\/home\/([^\/]+)\/public_html\//) {	if ($eps_f=~/\/home\/httpd\/html\/priv\/[^\/]+\/([^\/]+)\//) {
$eps_f=~s/\/home\/([^\/]+)\/public_html/$1/;	$eps_f=~s/\/home\/httpd\/html\/priv\/[^\/]+\/([^\/]+)/$1/;
} elsif ($eps_f=~/$perlvar{'lonDocRoot'}\/res\//) {	} elsif ($eps_f=~/$perlvar{'lonDocRoot'}\/res\//) {
$eps_f=~ s/$perlvar{'lonDocRoot'}\/res\/(.+)/$1/;	$eps_f=~ s/$perlvar{'lonDocRoot'}\/res\/(.+)/$1/;
} elsif ($eps_f=~/$perlvar{'lonUsersDir'}\//) {	} elsif ($eps_f=~/$perlvar{'lonUsersDir'}\//) {
Line 931 sub convert_figure {	Line 931 sub convert_figure {
$not_eps =~ s/ /\\ /g;	$not_eps =~ s/ /\\ /g;
my $prettyname=$not_eps;	my $prettyname=$not_eps;
if ($advanced_role) {	if ($advanced_role) {
$prettyname=~s\|/home/([^/]+)/public_html\|/priv/$1\|;
$prettyname=~s\|$perlvar{'lonDocRoot'}/\|/\|;	$prettyname=~s\|$perlvar{'lonDocRoot'}/\|/\|;
&Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,	&Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,
'Converting to EPS '.$prettyname);	'Converting to EPS '.$prettyname);