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

Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.210 and 1.212

version 1.210, 2010/11/09 12:50:06 version 1.212, 2010/11/23 17:05:20
Line 215  class MpdlXmlTextServer(SimpleItem): Line 215  class MpdlXmlTextServer(SimpleItem):
             return originalPage              return originalPage
           
           
     def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="", 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"""
         docpath = docinfo['textURLPath']          docpath = docinfo['textURLPath']
         path = docinfo['textURLPath']          path = docinfo['textURLPath']
Line 391  class MpdlXmlTextServer(SimpleItem): Line 391  class MpdlXmlTextServer(SimpleItem):
          logging.debug("documentViewer (pagedom) pagedom: %s"%(pagedom))           logging.debug("documentViewer (pagedom) pagedom: %s"%(pagedom))
          numdivs = pagedom.xpath("//div[@class='queryResultHits']")           numdivs = pagedom.xpath("//div[@class='queryResultHits']")
          tocSearch = int(getTextFromNode(numdivs[0]))             tocSearch = int(getTextFromNode(numdivs[0]))  
          tc=int((tocSearch/10)+1)             tc=int((tocSearch/30)+1)  
          return tc            return tc 
   
     def getQueryResultHitsFigures(self,  docinfo=None, pageinfo=None):            def getQueryResultHitsFigures(self,  docinfo=None, pageinfo=None):      
Line 411  class MpdlXmlTextServer(SimpleItem): Line 411  class MpdlXmlTextServer(SimpleItem):
          logging.debug("documentViewer (pagedom) pagedom: %s"%(pagedom))           logging.debug("documentViewer (pagedom) pagedom: %s"%(pagedom))
          numdivs = pagedom.xpath("//div[@class='queryResultHits']")           numdivs = pagedom.xpath("//div[@class='queryResultHits']")
          tocSearch = int(getTextFromNode(numdivs[0]))             tocSearch = int(getTextFromNode(numdivs[0]))  
          tc=int((tocSearch/10)+1)             tc=int((tocSearch/30)+1)  
          return tc            return tc 
   
   
Line 466  class MpdlXmlTextServer(SimpleItem): Line 466  class MpdlXmlTextServer(SimpleItem):
         tocMode = pageinfo['tocMode']          tocMode = pageinfo['tocMode']
         tocPN = pageinfo['tocPN']            tocPN = pageinfo['tocPN']  
                   
         data = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s&characterNormalization=%s&optionToggle=%s"%(docpath,queryType, pagesize, pn,characterNormalization,optionToggle))            data = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s&characterNormalization=regPlusNorm&optionToggle=%s"%(docpath,queryType, pagesize, pn,optionToggle))  
         page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&optionToggle=%s'%(selfurl,url, viewMode, tocMode, tocPN,optionToggle))          page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&optionToggle=%s'%(selfurl,url, viewMode, tocMode, tocPN,optionToggle))
         text = page.replace('mode=image','mode=texttool')          text = page.replace('mode=image','mode=texttool')
         logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))          logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))
Removed from v.1.210  
changed lines
  Added in v.1.212

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