--- loncom/xml/londefdef.pm	2002/04/26 18:18:37	1.54
+++ loncom/xml/londefdef.pm	2002/05/09 15:44:43	1.57
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.54 2002/04/26 18:18:37 sakharuk Exp $
+# $Id: londefdef.pm,v 1.57 2002/05/09 15:44:43 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -48,7 +48,7 @@ package Apache::londefdef;
 use Apache::lonnet;
 use strict;
 use Apache::lonxml;
-
+use Apache::File();
 
 BEGIN {
 
@@ -337,7 +337,8 @@ sub end_m {
 		  delete($token->[2]->{$key});
 		}
 	      }
-	      $token->[2]->{'onLoad'}=$onLoad.&Apache::lonxml::loadevents();
+	      $token->[2]->{'onLoad'}=&Apache::lonxml::loadevents().
+		                       ';'.$onLoad;
 	      my $onUnload='';
 	      foreach my $key (keys(%{$token->[2]})) {
 		if ($key =~ /^onunload$/i) {
@@ -345,8 +346,8 @@ sub end_m {
 		  delete($token->[2]->{$key});
 		}
 	      }
-	      $token->[2]->{'onUnload'}=$onUnload.
-		&Apache::lonxml::unloadevents();
+	      $token->[2]->{'onUnload'}=&Apache::lonxml::unloadevents().
+		                         ';'.$onUnload;
 
 	      $currentstring .= '<'.$token->[1];
 	      foreach (keys %{$token->[2]}) {
@@ -1390,12 +1391,24 @@ EDITBUTTON
 	      my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
 	      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
 	      my $file;
-	      my $path;
-	      $file=~s/(\.gif|\.jpg)$/\.eps/;
-	      if ($path) {
-		$currentstring .= '\graphicspath{{'.$path.'/}}\fbox{\includegraphics{'.$file.'}}';
+	      my $path;	
+              if ($src =~ m!(.*)/([^/]*)$!) {
+		  $file = $2;
+		  $path = $1.'/'; 
+	      }
+	      my $newsrc = $src;
+	      $newsrc =~ s/(\.gif|\.jpg)$/\.eps/;
+		  $file=~s/(\.gif|\.jpg)$/\.eps/;
+	      if (-e $newsrc) {
+		  if ($path) {
+		      $currentstring .= '\graphicspath{{'.$path.'}}\fbox{\includegraphics{'.$file.'}}';
+		  }
 	      } else {
-		$currentstring .= 'See the image at \tt{'.$src.'}';
+		  my $temp_file;
+		  my $filename = "/home/httpd/prtspool/$ENV{'user.name'}$ENV{'user.domain'}temp$ENV{'user.login.time'}.dat";
+		  $temp_file = Apache::File->new('>>'.$filename); 
+		  print $temp_file "$src\n";
+		  $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics{'.$file.'}}';
 	      }
 	    }
 	    return $currentstring;