[BACK]Return to MpdlXmlTextServer.py CVS log [TXT] [DIR] Up to [Repository] / documentViewer

Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.213 and 1.215

version 1.213, 2010/11/24 11:32:36 version 1.215, 2010/12/06 10:41:55
Line 143  class MpdlXmlTextServer(SimpleItem): Line 143  class MpdlXmlTextServer(SimpleItem):
     def getGisPlaces(self, docinfo=None, pageinfo=None):      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'
         docpath = docinfo['textURLPath']           docpath = docinfo.get('textURLPath',None)
           if not docpath:
               return None
   
         url = docinfo['url']          url = docinfo['url']
         selfurl = self.absolute_url()          selfurl = self.absolute_url()
         pn = pageinfo['current']          pn = pageinfo['current']
Line 198  class MpdlXmlTextServer(SimpleItem): Line 201  class MpdlXmlTextServer(SimpleItem):
                         
     def getOrigPages (self, docinfo=None, pageinfo=None):      def getOrigPages (self, docinfo=None, pageinfo=None):
         """Show original page """          """Show original page """
         docpath = docinfo['textURLPath']           docpath = docinfo.get('textURLPath',None)
           if not docpath:
               return None
   
         logging.debug ("docinfo['textURLPath']=%s"%(docinfo['textURLPath']))          logging.debug ("docinfo['textURLPath']=%s"%(docinfo['textURLPath']))
         #url = docinfo['url']          #url = docinfo['url']
         selfurl = self.absolute_url()          selfurl = self.absolute_url()
Line 208  class MpdlXmlTextServer(SimpleItem): Line 214  class MpdlXmlTextServer(SimpleItem):
         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))
         dom =Parse(text)          dom =Parse(text)
         pagedivs = dom.xpath("//div[@class='pageNumberOrig']")          pagedivs = dom.xpath("//div[@class='pageNumberOrig']")
         logging.debug("YYYYYYpagedivs :%s"%(pagedivs))  
         if len(pagedivs)>0:          if len(pagedivs)>0:
             originalPage= getTextFromNode(pagedivs[0])              originalPage= getTextFromNode(pagedivs[0])
             #return docinfo['originalPage']              #return docinfo['originalPage']
             return originalPage              return originalPage
           
       def getAllPlaces (self, docinfo=None, pageinfo=None):
           """Show all Places if no places than 0"""
           docpath = docinfo['textURLPath'] 
           selfurl = self.absolute_url()   
           viewMode=  pageinfo['viewMode']
           text = self.getServerData("page-fragment.xql","document=%s&mode=%s"%(docinfo['textURLPath'], 'text'))
           dom =Parse(text)
           pagedivs = dom.xpath("//div[@class='countPlaces']")
           logging.debug ("pagedivs=%s"%(pagedivs))
           #originalPage= getTextFromNode(pagedivs[0])
           #return allPlaces
           if len(pagedivs)>0:
               originalPage= getTextFromNode(pagedivs[0])
               #return docinfo['originalPage']
               return originalPage
           
     def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="regPlusNorm", highlightQuery=None, sn=None, optionToggle=None):      def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="regPlusNorm", highlightQuery=None, sn=None, optionToggle=None):
         """returns single page from fulltext"""          """returns single page from fulltext"""
Removed from v.1.213  
changed lines
  Added in v.1.215

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