Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.76 and 1.141

version 1.76, 2010/10/11 14:41:47 version 1.141, 2010/10/14 14:53: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 getGisPlases(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=%s"%(docinfo['textURLPath'], xpath))          docpath = docinfo['textURLPath'] 
         pagedom = Parse(text)          url = docinfo['url']
         result =pagedom.xpath("//result/resultPage/")          selfurl = self.absolute_url()
           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"place")              hrefNode= l.getAttributeNodeNS(None, u"id")
             if hrefNode:  
                 href= hrefNode.nodeValue                  href= hrefNode.nodeValue
                 if href.startswith('id='):              hrefList.append(href)
                     hrefNode.nodeValue = href.replace('id=',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%sid="%(url,viewMode,tocMode,tocPN,pn))              myList = ",".join(hrefList)
                     logging.debug("YYYY href%s"%href)              #hoho =hrefList.replace('','')
         return serializeNode(pagenode)              #probe =href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl/%s'%name)
               #l.setAttributeNS(None, 'target', '_blank')
           logging.debug("getGisPlaces :%s"%(myList))                             
           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.76  
changed lines
  Added in v.1.141


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