Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.96 and 1.143

version 1.96, 2010/10/13 15:49:08 version 1.143, 2010/10/15 09:58:12
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']          pn = pageinfo['current']
           hrefList=[]
           myList= ""
           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:
               hrefNode= l.getAttributeNodeNS(None, u"id")
               href= hrefNode.nodeValue
               hrefList.append(href)
               myList = ",".join(hrefList)                            
           return myList
       
                   
         text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],'//place',pn))      def getAllGisPlaces (self, docinfo=None, pageinfo=None):
         #logging.debug("documentViewer getGisPlaces (text) text:%s"%(text))          """Show all Gis Places of whole Book """
         pagedom = Parse(text)          xpath ='//echo:place'
         result =pagedom.xpath("//result/resultPage/place")          docpath =docinfo['textURLPath']
         logging.debug("getGisPlaces (place) result:%s"%(result))          url = docinfo['url']
           selfurl =self.absolute_url()
           pn =pageinfo['current']
           hrefList=[]
           myList=""
           text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'],xpath))
           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=',"?")                                    myList = ",".join(hrefList)
         return serializeNode(pagenode)      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.96  
changed lines
  Added in v.1.143


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