--- documentViewer/documentViewer.py 2006/06/13 14:57:46 1.10.2.1 +++ documentViewer/documentViewer.py 2006/06/13 15:10:35 1.11 @@ -7,7 +7,7 @@ from Globals import package_home from Ft.Xml.Domlette import NonvalidatingReader from Ft.Xml.Domlette import PrettyPrint, Print -from Ft.Xml import EMPTY_NAMESPACE +from Ft.Xml import EMPTY_NAMESPACE, Parse import Ft.Xml.XPath @@ -192,12 +192,9 @@ class documentViewer(Folder): def getIndexMeta(self, url): """returns dom of index.meta document at url""" - num_retries = 3 dom = None - metaUrl = None if url.startswith("http://"): # real URL - metaUrl = url try: dom = NonvalidatingReader.parseUri(url) except: @@ -209,17 +206,14 @@ class documentViewer(Folder): metaUrl=server+url if not metaUrl.endswith("index.meta"): metaUrl += "/index.meta" - - for n in range(num_retries): try: - dom = NonvalidatingReader.parseUri(metaUrl) - zLOG.LOG("documentViewer (getIndexMata)", zLOG.INFO,metaUrl) - break + # patch dirk encoding fehler treten dann nicht mehr auf + # dom = NonvalidatingReader.parseUri(metaUrl) + txt=urllib.urlopen(metaUrl).read() + dom = Parse(txt) except: - zLOG.LOG("ERROR documentViewer (getIndexMata)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2]) - - if dom is None: - raise IOError("Unable to read index meta from %s"%(url)) + zLOG.LOG("documentViewer (getIndexMata)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2]) + raise IOError("Unable to read index meta from %s"%(metaUrl)) return dom