Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.80 and 1.85

version 1.80, 2010/10/11 15:06:33 version 1.85, 2010/10/11 15:54:24
Line 145  class MpdlXmlTextServer(SimpleItem): Line 145  class MpdlXmlTextServer(SimpleItem):
         xpath='//place'          xpath='//place'
         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))
         pagedom = Parse(text)          pagedom = Parse(text)
         result =pagedom.xpath("//result/resultPage/")          result =pagedom.xpath("//result/resultPage")
         for l in result:          for l in result:
             hrefNode= l.getAttributeNodeNS(None, u"place")              hrefNode= l.getAttributeNodeNS(None, u"place")
               logging.debug("documentViewer (characterNormalization) l:%s"%(l))
             if hrefNode:              if hrefNode:
                 href= hrefNode.nodeValue                  href= hrefNode.nodeValue
                 if href.startswith('id='):                  if href.startswith('id='):
                     hrefNode.nodeValue = href.replace('id=',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%sid="%(url,viewMode,tocMode,tocPN,pn))                      hrefNode.nodeValue = href.replace('id=',"?")
                     logging.debug("YYYY href%s"%href)                                  
                     logging.debug("YYYY serializeNode(pagenode)%s"%serializeNode(pagenode))  
                     logging.debug("YYYY hrefNode.nodeValue%s"%hrefNode.nodeValue)  
         logging.debug("YYYY serializeNode(pagenode)%s"%serializeNode(pagenode))              
         return serializeNode(pagenode)          return serializeNode(pagenode)
           
     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=""):

Removed from v.1.80  
changed lines
  Added in v.1.85


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