[BACK]Return to MpdlXmlTextServer.py CVS log [TXT] [DIR] Up to [Repository] / documentViewer

Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.92 and 1.100

version 1.92, 2010/10/13 15:35:41 version 1.100, 2010/10/13 16:34:32
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']
                   
         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")
         result =pagedom.xpath("//result/resultPage/*")          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))
Line 158  class MpdlXmlTextServer(SimpleItem): Line 159  class MpdlXmlTextServer(SimpleItem):
                 href= hrefNode.nodeValue                  href= hrefNode.nodeValue
                 if href.startswith('id='):                  if href.startswith('id='):
                     hrefNode.nodeValue = href.replace('id=',"?")                                            hrefNode.nodeValue = href.replace('id=',"?")                      
                       logging.debug("documentViewer getGisPlaces (characterNormalization) hrefNode.nodeValue:%s"%(hrefNode.nodeValue))                  
         return serializeNode(pagenode)          return serializeNode(pagenode)
           
     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=""):
Removed from v.1.92  
changed lines
  Added in v.1.100

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