--- documentViewer/MpdlXmlTextServer.py 2010/10/11 15:54:24 1.85 +++ documentViewer/MpdlXmlTextServer.py 2010/10/13 15:10:25 1.89 @@ -140,15 +140,20 @@ class MpdlXmlTextServer(SimpleItem): docinfo['numPages']=int(getTextFromNode(result[0])) return docinfo - def getGisPlases(self, docinfo): + def getGisPlaces(self, docinfo=None, pageinfo=None): """ Show all Gis Places of whole Page""" - xpath='//place' - text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'], xpath,pn)) + #xpath='//place' + docpath = docinfo['textURLPath'] + url = docinfo['url'] + selfurl = self.absolute_url() + + text=self.getServerData("xpath.xql", "document=%s&xpath='//place'%s&pn=%s"%(docinfo['textURLPath'],pn)) + logging.debug("documentViewer getGisPlaces (text) text:%s"%(text)) pagedom = Parse(text) - result =pagedom.xpath("//result/resultPage") + result =pagedom.xpath("//result/resultPage/*") for l in result: - hrefNode= l.getAttributeNodeNS(None, u"place") - logging.debug("documentViewer (characterNormalization) l:%s"%(l)) + hrefNode= l.getAttributeNodeNS(None, u"id") + logging.debug("documentViewer getGisPlaces (characterNormalization) l:%s"%(l)) if hrefNode: href= hrefNode.nodeValue if href.startswith('id='):