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

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

version 1.218, 2010/12/23 16:12:23 version 1.221, 2010/12/23 17:13:01
Line 138  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"""
         self.getInfoFromPage(docinfo)          docinfo = self.getInfoFromPage(docinfo)
           logging.debug("gettocentries: docinfo=%s"%docinfo)
         return docinfo['tocEntries']          return docinfo['tocEntries']
                           
     def getFigureEntries (self, docinfo=None):      def getFigureEntries (self, docinfo=None):
         """ number of figure entries"""          """ number of figure entries"""
         self.getInfoFromPage(docinfo)          docinfo = self.getInfoFromPage(docinfo)
         return docinfo['figureEntries']          return docinfo['figureEntries']
                                                 
     def getGisPlaces(self, docinfo=None, pageinfo=None):      def getGisPlaces(self, docinfo=None, pageinfo=None):
Line 209  class MpdlXmlTextServer(SimpleItem): Line 210  class MpdlXmlTextServer(SimpleItem):
           
     def getAllPlaces (self, docinfo=None):      def getAllPlaces (self, docinfo=None):
         """Show all Places if no places than 0"""          """Show all Places if no places than 0"""
         self.getInfoFromPage(docinfo)          docinfo = self.getInfoFromPage(docinfo)
         return docinfo['allPlaces']          return docinfo['allPlaces']
   
     def getInfoFromPage(self, docinfo=None):      def getInfoFromPage(self, docinfo=None):
Line 224  class MpdlXmlTextServer(SimpleItem): Line 225  class MpdlXmlTextServer(SimpleItem):
             dom = Parse(text)              dom = Parse(text)
             # figureEntries              # figureEntries
             pagedivs = dom.xpath("//div[@class='countFigureEntries']")              pagedivs = dom.xpath("//div[@class='countFigureEntries']")
             docinfo['figureEntries'] = getTextFromNode(pagedivs[0])              s = getTextFromNode(pagedivs[0])
               try:
                   docinfo['figureEntries'] = int(s)
               except:
                   docinfo['figureEntries'] = 0
             # tocEntries              # tocEntries
             pagedivs = dom.xpath("//div[@class='countTocEntries']")              pagedivs = dom.xpath("//div[@class='countTocEntries']")
             docinfo['tocEntries'] = getTextFromNode(pagedivs[0])              s = getTextFromNode(pagedivs[0])
               try:
                   docinfo['tocEntries'] = int(s)
               except:
                   docinfo['tocEntries'] = 0
             # allPlaces              # allPlaces
             pagedivs = dom.xpath("//div[@class='countPlaces']")              pagedivs = dom.xpath("//div[@class='countPlaces']")
             docinfo['allPlaces']= getTextFromNode(pagedivs[0])              s = getTextFromNode(pagedivs[0])
               try:
                   docinfo['allPlaces'] = int(s)
               except:
                   docinfo['allPlaces'] = 0
                   
           else:
               # no full text -- init to 0
               docinfo['figureEntries'] = 0
               docinfo['tocEntries'] = 0
               docinfo['allPlaces'] = 0
   
         return docinfo          return docinfo
                                                 
Removed from v.1.218  
changed lines
  Added in v.1.221

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