Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.86 and 1.105

version 1.86, 2010/10/11 15:57:22 version 1.105, 2010/10/13 16:48:14
Line 140  class MpdlXmlTextServer(SimpleItem): Line 140  class MpdlXmlTextServer(SimpleItem):
         docinfo['numPages']=int(getTextFromNode(result[0]))          docinfo['numPages']=int(getTextFromNode(result[0]))
         return docinfo          return docinfo
           
     def getGisPlaces(self, docinfo):      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'] 
           url = docinfo['url']
           selfurl = self.absolute_url()
           pn = pageinfo['current']
           
         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))
         pagedom = Parse(text)          dom = Parse(text)
         result =pagedom.xpath("//result/resultPage/*")          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))              logging.debug("documentViewer getGisPlaces (characterNormalization) l:%s"%(l))
             if hrefNode:              if hrefNode:
                 href= hrefNode.nodeValue                  href= hrefNode.nodeValue
                 if href.startswith('id='):                  if href.startswith('N'):
                     hrefNode.nodeValue = href.replace('id=',"?")                      #hrefNode.nodeValue = href.replace('id=',"?")   
                                                       logging.debug("documentViewer getGisPlaces (characterNormalization) hrefNode.nodeValue:%s"%(hrefNode.nodeValue))
         return serializeNode(pagenode)                      logging.debug("documentViewer getGisPlaces (characterNormalization) href:%s"%(href))     
           logging.debug("documentViewer getGisPlaces ALL GIS TOGETHER href:%s"%(href))                             
           return serializeNode(href)
           
     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.86  
changed lines
  Added in v.1.105


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