[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 02 Aug 2005 15:22:58 -0000


albertel		Tue Aug  2 11:22:58 2005 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  - only munge the file name if we have to do a conversion
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.282 loncom/xml/londefdef.pm:1.283
--- loncom/xml/londefdef.pm:1.282	Fri Jul 22 07:44:51 2005
+++ loncom/xml/londefdef.pm	Tue Aug  2 11:22:56 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.282 2005/07/22 11:44:51 foxr Exp $
+# $Id: londefdef.pm,v 1.283 2005/08/02 15:22:56 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -3991,13 +3991,13 @@
 		close FILE;
 		$src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
 		$src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
+		if ($sext ne "") {	 # Put the ext. back in to uniquify.
+		    $src =~ s/\.eps$/$sext.eps/;
+		}
 	    }
 	}
     }
     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<BR />");
     return ($path.'/',$file);
 }