Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.101 and 1.141

version 1.101, 2010/10/13 16:38:29 version 1.141, 2010/10/14 14:53:14
Line 147  class MpdlXmlTextServer(SimpleItem): Line 147  class MpdlXmlTextServer(SimpleItem):
         url = docinfo['url']          url = docinfo['url']
         selfurl = self.absolute_url()          selfurl = self.absolute_url()
         pn = pageinfo['current']          pn = pageinfo['current']
           hrefList=[]
                   
         text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],xpath,pn))          text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],xpath,pn))
         dom = Parse(text)          dom = Parse(text)
         result = dom.xpath("//result/resultPage/place")          result = dom.xpath("//result/resultPage/place")
         logging.debug("getGisPlaces (place) result:%s"%(result))  
         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=',"?")                 myList = ",".join(hrefList)
                     logging.debug("documentViewer getGisPlaces (characterNormalization) hrefNode.nodeValue:%s"%(hrefNode.nodeValue))                                #hoho =hrefList.replace('','')
         return serializeNode(pagenode)              #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 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.101  
changed lines
  Added in v.1.141


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