--- loncom/xml/londefdef.pm 2002/11/15 15:14:12 1.102 +++ loncom/xml/londefdef.pm 2002/11/15 16:35:23 1.103 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.102 2002/11/15 15:14:12 sakharuk Exp $ +# $Id: londefdef.pm,v 1.103 2002/11/15 16:35:23 sakharuk Exp $ # # # Copyright Michigan State University Board of Trustees @@ -1575,10 +1575,8 @@ sub start_table { $height_param = $image->Get('height') * $scaling;; undef $image; #do we have any specified size of the picture? - my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval, - undef,1); - my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval, - undef,1); + my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval) + my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval) my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval, undef,1); if ($TeXwidth ne '') { @@ -1599,8 +1597,8 @@ sub start_table { $path = $1.'/'; } my $newsrc = $src; - $newsrc =~ s/(\.gif|\.jpg|\.png)$/\.eps/i; - $file=~s/(\.gif|\.jpg|\.png)$/\.eps/i; + $newsrc =~ s/\.(gif|jpg|png)$/.eps/i; + $file=~s/\.(gif|jpg|png)$/.eps/i; #where can we find the picture? if (-e $newsrc) { #eps counterpart for image exist @@ -2553,7 +2551,7 @@ sub image_replication { &Apache::lonnet::repcopy('/home/httpd/html'.$src); #replicates eps or ps my $newsrc = $src; - $newsrc =~ s/(.gif|.jpg|\.png)$/.eps/; + $newsrc =~ s/(.gif|.jpg|.png)$/.eps/; if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') { $newsrc =~ s/\.ps$/\.eps/; &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc);