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

Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.216 and 1.221

version 1.216, 2010/12/20 13:52:07 version 1.221, 2010/12/23 17:13:01
Line 120  class MpdlXmlTextServer(SimpleItem): Line 120  class MpdlXmlTextServer(SimpleItem):
           
     def getNumTextPages (self, docinfo=None):      def getNumTextPages (self, docinfo=None):
         """get list of pages from fulltext (texts without images) and put in docinfo"""          """get list of pages from fulltext (texts without images) and put in docinfo"""
           logging.debug("getNumTextPages")
         docpath = docinfo['textURLPath']           docpath = docinfo['textURLPath'] 
         selfurl = self.absolute_url()             selfurl = self.absolute_url()   
         #viewMode=  pageinfo['viewMode']          #viewMode=  pageinfo['viewMode']
Line 137  class MpdlXmlTextServer(SimpleItem): Line 138  class MpdlXmlTextServer(SimpleItem):
             
     def getTocEntries (self, docinfo=None):      def getTocEntries (self, docinfo=None):
         """ number of text entries"""          """ number of text entries"""
         docpath = docinfo['textURLPath']           docinfo = self.getInfoFromPage(docinfo)
         selfurl = self.absolute_url()          logging.debug("gettocentries: docinfo=%s"%docinfo)
         if (docpath!=None):          return docinfo['tocEntries']
             text = self.getServerData("page-fragment.xql","document=%s"%(docinfo['textURLPath']))  
             dom =Parse(text)  
             pagedivs = dom.xpath("//div[@class='countTocEntries']")  
             logging.debug ("pagedivs=%s"%(pagedivs))  
             originalPage = getTextFromNode(pagedivs[0])  
             tc = int (originalPage)  
             return tc  
                           
     def getFigureEntries (self, docinfo=None):      def getFigureEntries (self, docinfo=None):
         """ number of figure entries"""          """ number of figure entries"""
         docpath = docinfo['textURLPath']           docinfo = self.getInfoFromPage(docinfo)
         selfurl = self.absolute_url()          return docinfo['figureEntries']
         if (docpath!=None):     
             text = self.getServerData("page-fragment.xql","document=%s"%(docinfo['textURLPath']))  
             dom = Parse(text)  
             pagedivs = dom.xpath("//div[@class='countFigureEntries']")  
             logging.debug ("pagedivs=%s"%(pagedivs))  
             originalPage = getTextFromNode(pagedivs[0])  
             tc = int (originalPage)  
             return tc  
                                                 
     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"""
Line 210  class MpdlXmlTextServer(SimpleItem): Line 196  class MpdlXmlTextServer(SimpleItem):
         docpath = docinfo.get('textURLPath',None)          docpath = docinfo.get('textURLPath',None)
         if not docpath:          if not docpath:
             return None              return None
   
         logging.debug ("docinfo['textURLPath']=%s"%(docinfo['textURLPath']))  
         #url = docinfo['url']  
         selfurl = self.absolute_url()          selfurl = self.absolute_url()
         pn =pageinfo['current']          pn =pageinfo['current']
                 
Line 225  class MpdlXmlTextServer(SimpleItem): Line 208  class MpdlXmlTextServer(SimpleItem):
             #return docinfo['originalPage']              #return docinfo['originalPage']
             return originalPage              return originalPage
           
     def getAllPlaces (self, docinfo=None, pageinfo=None):      def getAllPlaces (self, docinfo=None):
         """Show all Places if no places than 0"""          """Show all Places if no places than 0"""
           docinfo = self.getInfoFromPage(docinfo)
           return docinfo['allPlaces']
   
       def getInfoFromPage(self, docinfo=None):
           """ extract diverse info from page-fragment"""
         docpath = docinfo['textURLPath']           docpath = docinfo['textURLPath'] 
         selfurl = self.absolute_url()             if 'allPlaces' in docinfo:
         viewMode=  pageinfo['viewMode']              # allredy there
         text = self.getServerData("page-fragment.xql","document=%s&mode=%s"%(docinfo['textURLPath'], 'text'))              return docinfo
           
           if (docpath is not None):   
               text = self.getServerData("page-fragment.xql","document=%s"%(docinfo['textURLPath']))
         dom =Parse(text)          dom =Parse(text)
               # figureEntries
               pagedivs = dom.xpath("//div[@class='countFigureEntries']")
               s = getTextFromNode(pagedivs[0])
               try:
                   docinfo['figureEntries'] = int(s)
               except:
                   docinfo['figureEntries'] = 0
               # tocEntries
               pagedivs = dom.xpath("//div[@class='countTocEntries']")
               s = getTextFromNode(pagedivs[0])
               try:
                   docinfo['tocEntries'] = int(s)
               except:
                   docinfo['tocEntries'] = 0
               # allPlaces
         pagedivs = dom.xpath("//div[@class='countPlaces']")          pagedivs = dom.xpath("//div[@class='countPlaces']")
         logging.debug ("pagedivs=%s"%(pagedivs))              s = getTextFromNode(pagedivs[0])
         if len(pagedivs)>0:              try:
             originalPage= getTextFromNode(pagedivs[0])                  docinfo['allPlaces'] = int(s)
             return originalPage              except:
                   docinfo['allPlaces'] = 0
                   
           else:
               # no full text -- init to 0
               docinfo['figureEntries'] = 0
               docinfo['tocEntries'] = 0
               docinfo['allPlaces'] = 0
   
           return docinfo
                          
                         
     def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="reg", highlightQuery=None, sn=None, optionToggle=None):      def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="reg", highlightQuery=None, sn=None, optionToggle=None):
         """returns single page from fulltext"""          """returns single page from fulltext"""
Removed from v.1.216  
changed lines
  Added in v.1.221

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