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

version 1.119, 2010/10/14 10:36:19 version 1.143, 2010/10/15 09:58:12
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=[]
           myList= ""
         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")
         for l in result:          for l in result:
             hrefNode= l.getAttributeNodeNS(None, u"id")              hrefNode= l.getAttributeNodeNS(None, u"id")
             href= hrefNode.nodeValue              href= hrefNode.nodeValue
               hrefList.append(href)
               myList = ",".join(hrefList)                            
           return myList
       
                           
             #logging.debug("getGisPlaces :%s"%(href))      def getAllGisPlaces (self, docinfo=None, pageinfo=None):
             #logging.debug("getGisPlaces :%s"%(href))          """Show all Gis Places of whole Book """
                 #if href.startswith('id='):          xpath ='//echo:place'
                     #hrefNode.nodeValue = href.replace('id=',"?")             docpath =docinfo['textURLPath']
                     #logging.debug("documentViewer getGisPlaces (characterNormalization) hrefNode.nodeValue:%s"%(hrefNode.nodeValue))          url = docinfo['url']
         href = ",".join(href)                      selfurl =self.absolute_url()
         logging.debug("getGisPlaces :%s"%(href))                                      pn =pageinfo['current']
         return href          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:
               hrefNode = l.getAttributeNodeNS(None, u"id")
               href= hrefNode.nodeValue
               hrefList.append(href)
               myList = ",".join(hrefList)
       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.119  
changed lines
  Added in v.1.143


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