--- documentViewer/documentViewer.py 2006/06/13 14:57:46 1.10.2.1 +++ documentViewer/documentViewer.py 2006/06/13 15:21:47 1.12 @@ -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 @@ -198,11 +198,6 @@ class documentViewer(Folder): if url.startswith("http://"): # real URL metaUrl = url - try: - dom = NonvalidatingReader.parseUri(url) - except: - zLOG.LOG("documentViewer (getIndexMata)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2]) - raise IOError("Unable to read index.meta from %s"%(url)) else: # online path server=self.digilibBaseUrl+"/servlet/Texter?fn=" @@ -212,9 +207,10 @@ class documentViewer(Folder): 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])