Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.168 and 1.182

version 1.168, 2010/10/18 10:01:16 version 1.182, 2010/10/18 12:05:23
Line 178  class MpdlXmlTextServer(SimpleItem): Line 178  class MpdlXmlTextServer(SimpleItem):
             logging.debug("getALLGisPlaces :%s"%(myList))              logging.debug("getALLGisPlaces :%s"%(myList))
         return myList          return myList
           
     def getOrigPages (self, docinfo=None):      def getOrigPages (self, docinfo=None,pageinfo=None):
         """Show original page """          """Show original page """
         #docpath = docinfo['textURLPath']           #docpath = docinfo['textURLPath'] 
         #url = docinfo['url']          #url = docinfo['url']
Line 187  class MpdlXmlTextServer(SimpleItem): Line 187  class MpdlXmlTextServer(SimpleItem):
                 
         viewMode=  pageinfo['viewMode']          viewMode=  pageinfo['viewMode']
         text = self.getServerData("page-fragment.xql","document=%s&mode=%s&pn=%s"%(docinfo['textURLPath'], 'text',  pn))          text = self.getServerData("page-fragment.xql","document=%s&mode=%s&pn=%s"%(docinfo['textURLPath'], 'text',  pn))
           logging.debug("textXAXA :%s"%(text))
         dom =Parse(text)          dom =Parse(text)
         pagedivs = dom.xpath("//div[@class='pageNumberOrig']")          pagedivs = dom.xpath("//div[@class='pageNumberOrig']")
         if len(pagedivs)>0:          if len(pagedivs)>0:
             docinfo['originalPage'] = getTextFromNode(pagedivs[0])              originalPage = getTextFromNode(pagedivs[0])
             #return docinfo['originalPage']              #return docinfo['originalPage']
             #return originalPage              return originalPage
             return docinfo              #return docinfo
                   
     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.168  
changed lines
  Added in v.1.182


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