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

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

version 1.216, 2010/12/20 13:52:07 version 1.217, 2010/12/23 15:38:41
Line 139  class MpdlXmlTextServer(SimpleItem): Line 139  class MpdlXmlTextServer(SimpleItem):
         """ number of text entries"""          """ number of text entries"""
         docpath = docinfo['textURLPath']           docpath = docinfo['textURLPath'] 
         selfurl = self.absolute_url()          selfurl = self.absolute_url()
           if 'tocEntries' in docinfo:
               # allredy there
               return docinfo['tocEntries']
         if (docpath!=None):          if (docpath!=None):
             text = self.getServerData("page-fragment.xql","document=%s"%(docinfo['textURLPath']))              text = self.getServerData("page-fragment.xql","document=%s"%(docinfo['textURLPath']))
             dom =Parse(text)              dom =Parse(text)
             pagedivs = dom.xpath("//div[@class='countTocEntries']")              pagedivs = dom.xpath("//div[@class='countTocEntries']")
             logging.debug ("pagedivs=%s"%(pagedivs))              #logging.debug ("pagedivs=%s"%(pagedivs))
             originalPage = getTextFromNode(pagedivs[0])              docinfo['tocEntries'] = getTextFromNode(pagedivs[0])
             tc = int (originalPage)              #tc = int (originalPage)
             return tc              return docinfo['tocEntries']
                           
     def getFigureEntries (self, docinfo=None):      def getFigureEntries (self, docinfo=None):
         """ number of figure entries"""          """ number of figure entries"""
         docpath = docinfo['textURLPath']           docpath = docinfo['textURLPath'] 
         selfurl = self.absolute_url()          selfurl = self.absolute_url()
           if 'figureEntries' in docinfo:
               # allredy there
               return docinfo['figureEntries']
         if (docpath!=None):             if (docpath!=None):   
             text = self.getServerData("page-fragment.xql","document=%s"%(docinfo['textURLPath']))              text = self.getServerData("page-fragment.xql","document=%s"%(docinfo['textURLPath']))
             dom = Parse(text)              dom = Parse(text)
             pagedivs = dom.xpath("//div[@class='countFigureEntries']")              pagedivs = dom.xpath("//div[@class='countFigureEntries']")
             logging.debug ("pagedivs=%s"%(pagedivs))              #logging.debug ("pagedivs=%s"%(pagedivs))
             originalPage = getTextFromNode(pagedivs[0])              docinfo['figureEntries'] = getTextFromNode(pagedivs[0])
             tc = int (originalPage)              #tc = int (docinfo['figureEntries'])
             return tc              return docinfo['figureEntries']
                                                 
     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 216  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 228  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"""
         docpath = docinfo['textURLPath']           docpath = docinfo['textURLPath'] 
         selfurl = self.absolute_url()             selfurl = self.absolute_url()   
         viewMode=  pageinfo['viewMode']          if 'allPlaces' in docinfo:
         text = self.getServerData("page-fragment.xql","document=%s&mode=%s"%(docinfo['textURLPath'], 'text'))              # allredy there
               return docinfo['allPlaces']
           
           text = self.getServerData("page-fragment.xql","document=%s"%(docinfo['textURLPath']))
         dom =Parse(text)          dom =Parse(text)
         pagedivs = dom.xpath("//div[@class='countPlaces']")          pagedivs = dom.xpath("//div[@class='countPlaces']")
         logging.debug ("pagedivs=%s"%(pagedivs))          logging.debug ("pagedivs=%s"%(pagedivs))
         if len(pagedivs)>0:          if len(pagedivs)>0:
             originalPage= getTextFromNode(pagedivs[0])              docinfo['allPlaces']= getTextFromNode(pagedivs[0])
             return originalPage              #logging.debug ("docinfo['allPlaces']=%s"%(docinfo['allPlaces']))
               return docinfo['allPlaces']
                         
     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.217

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