# HG changeset patch # User abukhman # Date 1287058123 -7200 # Node ID 3b54df7ca88e948ebaa62f98855e0bbdd5c52c03 # Parent 21e87569f7117a9f906d00f19796a1b64ec83fce *** empty log message *** diff -r 21e87569f711 -r 3b54df7ca88e MpdlXmlTextServer.py --- a/MpdlXmlTextServer.py Thu Oct 14 14:03:20 2010 +0200 +++ b/MpdlXmlTextServer.py Thu Oct 14 14:08:43 2010 +0200 @@ -147,6 +147,7 @@ url = docinfo['url'] selfurl = self.absolute_url() pn = pageinfo['current'] + hrefList=[] text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],xpath,pn)) dom = Parse(text) @@ -154,17 +155,18 @@ for l in result: hrefNode= l.getAttributeNodeNS(None, u"id") href= hrefNode.nodeValue - + hrefList.add(href) + #href=href.href #href = ",".join(href) - logging.debug("getGisPlaces :%s"%(href)) + logging.debug("getGisPlaces :%s"%(hrefList)) #return ";".join(["%s=%s" % (href, href) for href, href in params.items()]) - logging.debug("getGisPlaces :%s"%(href)) + #logging.debug("getGisPlaces :%s"%(href)) #if href.startswith('id='): #hrefNode.nodeValue = href.replace('id=',"?") #logging.debug("documentViewer getGisPlaces (characterNormalization) hrefNode.nodeValue:%s"%(hrefNode.nodeValue)) #logging.debug("getGisPlaces :%s"%(href)) - return href + return hrefList #return "no text here" def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""):