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

Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.41 and 1.45

version 1.41, 2010/09/24 13:48:03 version 1.45, 2010/10/05 09:53:03
Line 123  class MpdlXmlTextServer(SimpleItem): Line 123  class MpdlXmlTextServer(SimpleItem):
         if 'numPages' in docinfo:          if 'numPages' in docinfo:
             # already there              # already there
             return docinfo              return docinfo
           
         xquery = '//pb'          xquery = '//pb'
         text = self.getServerData("xquery.xql","document=%s&xquery=%s"%(docinfo['textURLPath'],xquery))          text = self.getServerData("xquery.xql","document=%s&xquery=%s"%(docinfo['textURLPath'],xquery))
         #text = self.template.fulltextclient.eval("/mpdl/interface/xquery.xql", "document=%s&xquery=%s"%(docinfo['textURLPath'],xquery))  
         docinfo['numPages'] = text.count("<pb ")          docinfo['numPages'] = text.count("<pb ")
         return docinfo          return docinfo
                 
       def getNumTextPages (self, docinfo):
           """get list of pages from fulltext (texts without images) and put in docinfo"""
           if 'numPages' in docinfo:
               # allredy there
               return docinfo
           xpath ='/count(//pb)'
           text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'], xpath))
           logging.debug("documentViewer (text) text: %s"%(text))
           #docinfo['numPages']=text.xpath
           #logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))
           return docinfo
          
     def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""):      def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""):
         """returns single page from fulltext"""          """returns single page from fulltext"""
         docpath = docinfo['textURLPath']          docpath = docinfo['textURLPath']
Line 185  class MpdlXmlTextServer(SimpleItem): Line 195  class MpdlXmlTextServer(SimpleItem):
                           href=hrefNode.nodeValue                            href=hrefNode.nodeValue
                           if href.startswith('http://chinagis.mpiwg-berlin.mpg.de'):                            if href.startswith('http://chinagis.mpiwg-berlin.mpg.de'):
                               hrefNode.nodeValue =href.replace('chinagis_REST','chinagis')                                hrefNode.nodeValue =href.replace('chinagis_REST','chinagis')
                                 l.setAttributeNS(None, 'target', '_blank')
                   return serializeNode(pagenode)                    return serializeNode(pagenode)
                                           
         if mode == "pureXml":          if mode == "pureXml":
Removed from v.1.41  
changed lines
  Added in v.1.45

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