--- documentViewer/MpdlXmlTextServer.py 2010/10/13 15:06:03 1.88 +++ documentViewer/MpdlXmlTextServer.py 2010/10/13 15:40:57 1.93 @@ -140,10 +140,15 @@ class MpdlXmlTextServer(SimpleItem): docinfo['numPages']=int(getTextFromNode(result[0])) return docinfo - def getGisPlaces(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='//place'%s&pn=%s"%(docinfo['textURLPath'],pn)) + docpath = docinfo['textURLPath'] + url = docinfo['url'] + selfurl = self.absolute_url() + pn = pageinfo['current'] + + text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],'//place',pn)) logging.debug("documentViewer getGisPlaces (text) text:%s"%(text)) pagedom = Parse(text) result =pagedom.xpath("//result/resultPage/*") @@ -153,8 +158,7 @@ class MpdlXmlTextServer(SimpleItem): if hrefNode: href= hrefNode.nodeValue if href.startswith('id='): - hrefNode.nodeValue = href.replace('id=',"?") - + 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=""):