--- loncom/xml/londefdef.pm	2002/05/16 00:56:46	1.61
+++ loncom/xml/londefdef.pm	2002/05/23 20:19:04	1.64
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.61 2002/05/16 00:56:46 albertel Exp $
+# $Id: londefdef.pm,v 1.64 2002/05/23 20:19:04 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1444,6 +1444,36 @@ EDITBUTTON
 	      }
 	      my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
 	      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+	      my $epssrc = $src;
+	      $epssrc =~ s/(\.gif|\.jpg|\.GIF|\.JPG)$/\.eps/;
+	      if (not -e $epssrc) {
+		  my $localfile = $epssrc;
+		  $localfile =~ s/.*(\/res)/$1/;	
+		  my $file;
+		  my $path;	
+		  if ($localfile =~ m!(.*)/([^/]*)$!) {
+		      $file = $2;
+		      $path = $1.'/'; 
+		  }	
+		  my $signal_eps = 0;
+		  my @content_directory = &Apache::lonnet::dirlist($path);
+		  for (my $iy=0;$iy<=$#content_directory;$iy++) {
+		      my @tempo_array = split(/&/,$content_directory[$iy]);
+		      $content_directory[$iy] = $tempo_array[0];
+		      if ($file eq $tempo_array[0]) {
+			  $signal_eps = 1;
+			  last;
+		      }
+		  }
+		  if ($signal_eps) {
+		      my $eps_file = &Apache::lonnet::getfile($localfile);
+		  } else {
+		      $localfile = $src;
+		      $localfile =~ s/.*(\/res)/$1/;	
+		      my $as = &Apache::lonnet::getfile($src);
+		      
+		  }
+	      }
 	      my $file;
 	      my $path;	
               if ($src =~ m!(.*)/([^/]*)$!) {
@@ -1451,15 +1481,15 @@ EDITBUTTON
 		  $path = $1.'/'; 
 	      }
 	      my $newsrc = $src;
-	      $newsrc =~ s/(\.gif|\.jpg)$/\.eps/;
-		  $file=~s/(\.gif|\.jpg)$/\.eps/;
+	      $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;
+		  $file=~s/(\.gif|\.jpg)$/\.eps/i;
 	      if (-e $newsrc) {
 		  if ($path) {
 		      $currentstring .= '\graphicspath{{'.$path.'}}\fbox{\includegraphics'.$width_param.'{'.$file.'}}';
 		  }
 	      } else {
 		  my $temp_file;
-		  my $filename = "/home/httpd/prtspool/$ENV{'user.name'}$ENV{'user.domain'}temp$ENV{'user.login.time'}.dat";
+		  my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
 		  $temp_file = Apache::File->new('>>'.$filename); 
 		  print $temp_file "$src\n";
 		  $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics'.$width_param.'{'.$file.'}}';