Mercurial > hg > documentViewer

changeset 38:025d3b6cba51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes by dirk
author casties
date Tue, 13 Jun 2006 17:10:35 +0200
parents ead830ce45d6
children 1dd90aabd366
files documentViewer.py zpt/viewer_main.zpt
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/documentViewer.py	Wed Apr 12 20:53:00 2006 +0200
+++ b/documentViewer.py	Tue Jun 13 17:10:35 2006 +0200
@@ -7,7 +7,7 @@
 
 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
 
@@ -207,10 +207,13 @@
             if not metaUrl.endswith("index.meta"):
                 metaUrl += "/index.meta"
             try:
-                dom = NonvalidatingReader.parseUri(metaUrl)
+		# patch dirk encoding fehler treten dann nicht mehr auf
+                # dom = NonvalidatingReader.parseUri(metaUrl)
+		txt=urllib.urlopen(metaUrl).read()
+		dom = Parse(txt)
             except:
                 zLOG.LOG("documentViewer (getIndexMata)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
-                raise IOError("Unable to read index meta from %s"%(url))
+                raise IOError("Unable to read index meta from %s"%(metaUrl))
                  
         return dom
                         
--- a/zpt/viewer_main.zpt	Wed Apr 12 20:53:00 2006 +0200
+++ b/zpt/viewer_main.zpt	Tue Jun 13 17:10:35 2006 +0200
@@ -1,6 +1,7 @@
 <html tal:define="docinfo options/docinfo; pageinfo options/pageinfo">
 <head>
 <link rel="stylesheet" href="template/docuviewer_css" type="text/css">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body tal:condition="docinfo/numPages">
 <div tal:replace="structure python:here.template.head_main(docinfo=docinfo)"/>