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

Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.54 and 1.88

version 1.54, 2010/10/05 12:13:59 version 1.88, 2010/10/13 15:06:03
Line 118  class MpdlXmlTextServer(SimpleItem): Line 118  class MpdlXmlTextServer(SimpleItem):
                 return serializeNode(pagenode)                        return serializeNode(pagenode)      
         return "no text here"             return "no text here"   
                                                 
     def getNumPages(self, docinfo):      """def getNumPages(self, docinfo):
         """get list of pages from fulltext and put in docinfo"""          ""get list of pages from fulltext and put in docinfo""
         if 'numPages' in docinfo:          if 'numPages' in docinfo:
             # already there              # already there
             return docinfo                      return docinfo        
Line 127  class MpdlXmlTextServer(SimpleItem): Line 127  class MpdlXmlTextServer(SimpleItem):
         text = self.getServerData("xquery.xql","document=%s&xquery=%s"%(docinfo['textURLPath'],xquery))          text = self.getServerData("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):      def getNumTextPages (self, docinfo):
         """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"""
         if 'numPages' in docinfo:          if 'numPages' in docinfo:
Line 135  class MpdlXmlTextServer(SimpleItem): Line 135  class MpdlXmlTextServer(SimpleItem):
             return docinfo              return docinfo
         xpath ='/count(//pb)'          xpath ='/count(//pb)'
         text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'], xpath))          text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'], xpath))
         logging.debug("documentViewer (text) text: %s"%(text))  
         #docinfo['numPages']=text('resultPage')  
         dom = Parse(text)          dom = Parse(text)
           
         result= dom.xpath("//result/resultPage")          result= dom.xpath("//result/resultPage")
         docinfo['numPages']=int(getTextFromNode(result[0]))          docinfo['numPages']=int(getTextFromNode(result[0]))
         #logging.debug("documentViewer (characterNormalization) docinfo['numPages']: %s"%(docinfo['numPages']))  
         return docinfo          return docinfo
                 
       def getGisPlaces(self, docinfo):
           """ Show all Gis Places of whole Page"""
           #xpath='//place'
           text=self.getServerData("xpath.xql", "document=%s&xpath='//place'%s&pn=%s"%(docinfo['textURLPath'],pn))
           logging.debug("documentViewer getGisPlaces (text) text:%s"%(text))
           pagedom = Parse(text)
           result =pagedom.xpath("//result/resultPage/*")
           for l in result:
               hrefNode= l.getAttributeNodeNS(None, u"id")
               logging.debug("documentViewer getGisPlaces (characterNormalization) l:%s"%(l))
               if hrefNode:
                   href= hrefNode.nodeValue
                   if href.startswith('id='):
                       hrefNode.nodeValue = href.replace('id=',"?")
                                   
           return serializeNode(pagenode)
       
     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']
         path = docinfo['textURLPath']          path = docinfo['textURLPath']
         url = docinfo['url']          url = docinfo['url']
           name = docinfo['name']
         viewMode= pageinfo['viewMode']          viewMode= pageinfo['viewMode']
         tocMode = pageinfo['tocMode']          tocMode = pageinfo['tocMode']
         characterNormalization=pageinfo['characterNormalization']          characterNormalization=pageinfo['characterNormalization']
Line 198  class MpdlXmlTextServer(SimpleItem): Line 212  class MpdlXmlTextServer(SimpleItem):
                       if hrefNode:                        if hrefNode:
                           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/REST/db/chgis/mpdl','chinagis/REST/db/mpdl/%s'%name)
                               l.setAttributeNS(None, 'target', '_blank')                                l.setAttributeNS(None, 'target', '_blank')
                   return serializeNode(pagenode)                    return serializeNode(pagenode)
                                           
Removed from v.1.54  
changed lines
  Added in v.1.88

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