--- OSA_system2/OSAS_metadata.py	2005/04/06 09:18:41	1.7
+++ OSA_system2/OSAS_metadata.py	2005/10/10 18:11:10	1.9
@@ -12,7 +12,10 @@ import xml.dom.pulldom
 import OSAS_helpers
 import zLOG
 import string
-import xml.xpath
+try:
+    from xml.xpath import Evaluate
+except:
+    from Ft.Xml.XPath import Evaluate
 import xmlrpclib
 
 from types import *
@@ -38,7 +41,7 @@ class OSAS_MetadataMapping(SimpleItem):
         for fieldName in arglist.keys():
             setattr(self,"md_"+fieldName,arglist[fieldName])
         
-            
+           
     manage_options = SimpleItem.manage_options+(
         {'label':'Main Config','action':'changeMetadataMappingForm'},
         )
@@ -263,7 +266,7 @@ class OSAS_Metadata(Folder):
 
     def getDisplayFieldsAsStr(self,indexMeta):
         ret=[]
-	try:
+        try:
          if indexMeta and not (indexMeta==""):
             dom=xml.dom.pulldom.parseString(indexMeta)
 
@@ -288,8 +291,8 @@ class OSAS_Metadata(Folder):
                     return "; ".join(ret)
          else:
             return ""
-	except:
-	    return ""
+        except:
+            return ""
     def getDisplayFieldsAsStrOLD(self,indexMeta):
         """Gebe display fields als string zurück
         @param path: Pfad zum Object
@@ -429,7 +432,7 @@ class OSAS_Metadata(Folder):
                 xpathStr=MDF_xpathStart
 
 
-            xpathNodes=xml.xpath.Evaluate(xpathStr,actualNode)
+            xpathNodes=Evaluate(xpathStr,actualNode)
             
 
             if len(xpathNodes)>0:
@@ -500,7 +503,7 @@ class OSAS_Metadata(Folder):
                 xpathStr=MDF_xpathStart
 
 
-            xpathNodes=xml.xpath.Evaluate(xpathStr,actualNode)
+            xpathNodes=Evaluate(xpathStr,actualNode)
             
 
 
@@ -511,7 +514,7 @@ class OSAS_Metadata(Folder):
             else:
                 #existiert nicht dann neue erzeugen
 
-                if len(xml.xpath.Evaluate(MDF_xpathStart,dom))>0:
+                if len(Evaluate(MDF_xpathStart,dom))>0:
 
                     create=True