--- OSA_system2/OSAS_browser.py	2005/11/25 10:50:39	1.20
+++ OSA_system2/OSAS_browser.py	2005/11/25 17:49:53	1.21
@@ -14,6 +14,7 @@ import bz2
 import os
 import os.path
 import stat
+import Ft.Xml.XPath
 import xml.dom.minidom
 from types import *
 import xmlrpclib
@@ -78,7 +79,7 @@ class OSAS_storeOnline(SimpleItem):
               return self.getMetaInfoFromIndexMeta(path)
               #return "NO_METADATA"
         else:
-                      
+                  
            dom = xml.dom.minidom.parseString(f)
            
            try:
@@ -158,8 +159,8 @@ class OSAS_storeOnline(SimpleItem):
         path=os.path.normpath(path)
 
         try:
-            
-            dom=xml.dom.minidom.parseString(server.getFile(indexMeta))
+            dom = NonvalidatingReader.parseString(server.getFile(indexMeta),"http://www.mpiwg-berlin.mpg.de/")
+           
         except:
             zLOG.LOG("OSAS_browser (findEntryInIndexMeta)",zLOG.ERROR,"Cannot parse: %s"%indexMeta)
             return None
@@ -173,8 +174,8 @@ class OSAS_storeOnline(SimpleItem):
                 searchPath=searchPath[1:]
         #ist path ein directory? 
         xpath="/resource/dir[name='%s' and path='%s']"%(name,searchPath)
+        dirs=Ft.Xml.XPath.Evaluate(xpath,contextNode=dom)
 
-        dirs=xml.xpath.Evaluate(xpath,dom)
 
         if len(dirs)>0:
             return dirs[0].toxml
@@ -182,8 +183,8 @@ class OSAS_storeOnline(SimpleItem):
         #ist path ein file?      
         xpath="/resource/file[name='%s' and path='%s']"%(name,searchPath)
 
-        dirs=xml.xpath.Evaluate(xpath,dom)
 
+        dirs=Ft.Xml.XPath.Evaluate(xpath,contextNode=dom)
         if len(dirs)>0:
             return dirs[0].toxml()
         
@@ -348,9 +349,9 @@ class OSAS_storeOnline(SimpleItem):
 
                     if metaDataStr:
                         display=metaData.getDisplayFieldsAsStr(metaDataStr)
-                        dom=xml.dom.minidom.parseString(metaDataStr)
 
-                        if len(xml.xpath.Evaluate("/file/meta/video-file",dom))>0:
+                        dom = NonvalidatingReader.parseString(metaDataStr,"http://www.mpiwg-berlin.mpg.de/")
+                        if len(Ft.Xml.XPath.Evaluate("/file/meta/video-file",contextNode=dom))>0:
                             fileType='OSAS_videoFile'
                             
                     else: