Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.78 and 1.112

version 1.78, 2010/10/11 14:49:37 version 1.112, 2010/10/14 10:03:06
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()
         logging.debug("YYYY result%s"%result)          pn = pageinfo['current']
           
           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")
             logging.debug("YYYY hrefNode%s"%hrefNode)  
             if hrefNode:  
                 href= hrefNode.nodeValue                  href= hrefNode.nodeValue
                 if href.startswith('id='):              #koka=href
                     hrefNode.nodeValue = href.replace('id=',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%sid="%(url,viewMode,tocMode,tocPN,pn))              #logging.debug("getGisPlaces :%s"%(href))
                     logging.debug("YYYY href%s"%href)                  #if href.startswith('id='):
         return serializeNode(pagenode)                      #hrefNode.nodeValue = href.replace('id=',"?")   
                       #logging.debug("documentViewer getGisPlaces (characterNormalization) hrefNode.nodeValue:%s"%(hrefNode.nodeValue))
           logging.debug("getGisPlaces :%s"%(serializeNode(href)))                            
           return serializeNode(href)
           
     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.78  
changed lines
  Added in v.1.112


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