Mercurial > hg > documentViewer
comparison documentViewer.py @ 38:025d3b6cba51
fixes by dirk
author | casties |
---|---|
date | Tue, 13 Jun 2006 17:10:35 +0200 |
parents | ead830ce45d6 |
children | 1dd90aabd366 |
comparison
equal
deleted
inserted
replaced
37:ead830ce45d6 | 38:025d3b6cba51 |
---|---|
5 from AccessControl import getSecurityManager | 5 from AccessControl import getSecurityManager |
6 from Globals import package_home | 6 from Globals import package_home |
7 | 7 |
8 from Ft.Xml.Domlette import NonvalidatingReader | 8 from Ft.Xml.Domlette import NonvalidatingReader |
9 from Ft.Xml.Domlette import PrettyPrint, Print | 9 from Ft.Xml.Domlette import PrettyPrint, Print |
10 from Ft.Xml import EMPTY_NAMESPACE | 10 from Ft.Xml import EMPTY_NAMESPACE, Parse |
11 | 11 |
12 import Ft.Xml.XPath | 12 import Ft.Xml.XPath |
13 | 13 |
14 import os.path | 14 import os.path |
15 import sys | 15 import sys |
205 server=self.digilibBaseUrl+"/servlet/Texter?fn=" | 205 server=self.digilibBaseUrl+"/servlet/Texter?fn=" |
206 metaUrl=server+url | 206 metaUrl=server+url |
207 if not metaUrl.endswith("index.meta"): | 207 if not metaUrl.endswith("index.meta"): |
208 metaUrl += "/index.meta" | 208 metaUrl += "/index.meta" |
209 try: | 209 try: |
210 dom = NonvalidatingReader.parseUri(metaUrl) | 210 # patch dirk encoding fehler treten dann nicht mehr auf |
211 # dom = NonvalidatingReader.parseUri(metaUrl) | |
212 txt=urllib.urlopen(metaUrl).read() | |
213 dom = Parse(txt) | |
211 except: | 214 except: |
212 zLOG.LOG("documentViewer (getIndexMata)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2]) | 215 zLOG.LOG("documentViewer (getIndexMata)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2]) |
213 raise IOError("Unable to read index meta from %s"%(url)) | 216 raise IOError("Unable to read index meta from %s"%(metaUrl)) |
214 | 217 |
215 return dom | 218 return dom |
216 | 219 |
217 | 220 |
218 def getAuthinfoFromIndexMeta(self,path,docinfo=None,dom=None): | 221 def getAuthinfoFromIndexMeta(self,path,docinfo=None,dom=None): |