--- documentViewer/MpdlXmlTextServer.py 2010/10/11 15:06:33 1.80 +++ documentViewer/MpdlXmlTextServer.py 2010/10/11 15:45:51 1.81 @@ -145,17 +145,15 @@ class MpdlXmlTextServer(SimpleItem): xpath='//place' text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'], xpath,pn)) pagedom = Parse(text) - result =pagedom.xpath("//result/resultPage/") + result =pagedom.xpath("//result/resultPage/place") for l in result: - hrefNode= l.getAttributeNodeNS(None, u"place") + hrefNode= l.getAttributeNodeNS(None, u"id") + logging.debug("documentViewer (characterNormalization) l: %s"%(l)) if hrefNode: href= hrefNode.nodeValue if href.startswith('id='): - hrefNode.nodeValue = href.replace('id=',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%sid="%(url,viewMode,tocMode,tocPN,pn)) - logging.debug("YYYY href%s"%href) - logging.debug("YYYY serializeNode(pagenode)%s"%serializeNode(pagenode)) - logging.debug("YYYY hrefNode.nodeValue%s"%hrefNode.nodeValue) - logging.debug("YYYY serializeNode(pagenode)%s"%serializeNode(pagenode)) + hrefNode.nodeValue = href.replace('id=',"?") + return serializeNode(pagenode) def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""):