Changeset 38:025d3b6cba51 in documentViewer


Ignore:
Timestamp:
Jun 13, 2006, 3:10:35 PM (18 years ago)
Author:
casties
Branch:
default
Message:

fixes by dirk

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • documentViewer.py

    r37 r38  
    88from Ft.Xml.Domlette import NonvalidatingReader
    99from Ft.Xml.Domlette import PrettyPrint, Print
    10 from Ft.Xml import EMPTY_NAMESPACE
     10from Ft.Xml import EMPTY_NAMESPACE, Parse
    1111
    1212import Ft.Xml.XPath
    … …  
    208208                metaUrl += "/index.meta"
    209209            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)
    211214            except:
    212215                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))
    214217                 
    215218        return dom

  • zpt/viewer_main.zpt

    r36 r38  
    22<head>
    33<link rel="stylesheet" href="template/docuviewer_css" type="text/css">
     4<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
    45</head>
    56<body tal:condition="docinfo/numPages">
Note: See TracChangeset for help on using the changeset viewer.