Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.88 and 1.130

version 1.88, 2010/10/13 15:06:03 version 1.130, 2010/10/14 12:26:42
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'
         text=self.getServerData("xpath.xql", "document=%s&xpath='//place'%s&pn=%s"%(docinfo['textURLPath'],pn))          docpath = docinfo['textURLPath'] 
         logging.debug("documentViewer getGisPlaces (text) text:%s"%(text))          url = docinfo['url']
         pagedom = Parse(text)          selfurl = self.absolute_url()
         result =pagedom.xpath("//result/resultPage/*")          pn = pageinfo['current']
           hrefList=[]
   
           text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],xpath,pn))
           dom = Parse(text)
           result = dom.xpath("//result/resultPage/place")
         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=',"?")              hoho= hrefList.replace("['u%s']"%href,'%s'%href)
               logging.debug("getGisPlaces :%s"%(hoho))
           
                                                                   
         return serializeNode(pagenode)          return hrefList
           
     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.88  
changed lines
  Added in v.1.130


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