--- loncom/xml/londefdef.pm 2005/07/12 21:05:49 1.281 +++ loncom/xml/londefdef.pm 2005/07/22 11:44:51 1.282 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.281 2005/07/12 21:05:49 foxr Exp $ +# $Id: londefdef.pm,v 1.282 2005/07/22 11:44:51 foxr Exp $ # # # Copyright Michigan State University Board of Trustees @@ -47,7 +47,7 @@ use Image::Magick; use Apache::lonmenu(); use Apache::lonmeta(); use Apache::Constants qw(:common); - +use File::Basename; BEGIN { @@ -3962,6 +3962,7 @@ sub get_eps_image { my ($src)=@_; my $orig_src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1], $src); &Apache::lonxml::debug("get_eps_image: Original image: $orig_src"); + my ($spath, $sname, $sext) = fileparse($src, qr/\.(gif|png|jpg|jpeg)/i); $src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i; $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); &Apache::lonxml::debug("Filelocation gives: $src"); @@ -3994,6 +3995,9 @@ sub get_eps_image { } } my ($path,$file)=($src=~m|(.*)/([^/]*)$|); + if ($sext ne "") { # Put the ext. back in to uniquify. + $file =~ s/\.eps$/$sext.eps/; + } &Apache::lonxml::debug("get_eps_image returning: $path / $file
"); return ($path.'/',$file); }