Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.91 and 1.128

version 1.91, 2010/10/13 15:18:02 version 1.128, 2010/10/14 12:11:15
Line 142  class MpdlXmlTextServer(SimpleItem): Line 142  class MpdlXmlTextServer(SimpleItem):
           
     def getGisPlaces(self, docinfo=None, pageinfo=None):      def getGisPlaces(self, docinfo=None, pageinfo=None):
         """ Show all Gis Places of whole Page"""          """ Show all Gis Places of whole Page"""
         #xpath='//place'          xpath='//place'
         docpath = docinfo['textURLPath']           docpath = docinfo['textURLPath'] 
         url = docinfo['url']          url = docinfo['url']
         selfurl = self.absolute_url()          selfurl = self.absolute_url()
           pn = pageinfo['current']
           hrefList=[]
                   
         text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],'//place',pn))          text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],xpath,pn))
         logging.debug("documentViewer getGisPlaces (text) text:%s"%(text))          dom = Parse(text)
         pagedom = Parse(text)          result = dom.xpath("//result/resultPage/place")
         result =pagedom.xpath("//result/resultPage/*")  
         for l in result:          for l in result:
             hrefNode= l.getAttributeNodeNS(None, u"id")              hrefNode= l.getAttributeNodeNS(None, u"id")
             logging.debug("documentViewer getGisPlaces (characterNormalization) l:%s"%(l))  
             if hrefNode:  
                 href= hrefNode.nodeValue                  href= hrefNode.nodeValue
                 if href.startswith('id='):              hrefList.append(href)
                     hrefNode.nodeValue = href.replace('id=',"?")              #href=href.href
               #href = ",".join(href)
               logging.debug("getGisPlaces :%s"%(hrefList))
                                                                   
         return serializeNode(pagenode)              #return ";".join(["%s=%s" % (href, href) for href, href in params.items()])
           #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 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=""):      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"""          """returns single page from fulltext"""

Removed from v.1.91  
changed lines
  Added in v.1.128


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>