--- OSA_system2/OSAS_metadata.py 2005/04/06 09:18:41 1.7 +++ OSA_system2/OSAS_metadata.py 2005/04/25 19:55:30 1.8 @@ -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 * @@ -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