--- documentViewer/MpdlXmlTextServer.py 2010/10/14 14:53:14 1.141 +++ documentViewer/MpdlXmlTextServer.py 2010/10/15 10:30:52 1.145 @@ -148,7 +148,7 @@ class MpdlXmlTextServer(SimpleItem): selfurl = self.absolute_url() pn = pageinfo['current'] hrefList=[] - + myList= "" text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],xpath,pn)) dom = Parse(text) result = dom.xpath("//result/resultPage/place") @@ -157,12 +157,30 @@ class MpdlXmlTextServer(SimpleItem): href= hrefNode.nodeValue hrefList.append(href) myList = ",".join(hrefList) - #hoho =hrefList.replace('','') - #probe =href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl/%s'%name) - #l.setAttributeNS(None, 'target', '_blank') logging.debug("getGisPlaces :%s"%(myList)) return myList + def getAllGisPlaces (self, docinfo=None, pageinfo=None): + """Show all Gis Places of whole Book """ + xpath ='//echo:place' + docpath =docinfo['textURLPath'] + url = docinfo['url'] + selfurl =self.absolute_url() + pn =pageinfo['current'] + hrefList=[] + myList="" + text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'],xpath)) + dom =Parse(text) + result = dom.xpath("//result/resultPage/place") + for l in result: + hrefNode = l.getAttributeNodeNS(None, u"id") + href= hrefNode.nodeValue + hrefList.append(href) + myList = ",".join(hrefList) + logging.debug("getALLGisPlaces :%s"%(myList)) + return myList + + def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""): """returns single page from fulltext""" docpath = docinfo['textURLPath']