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

Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.47 and 1.63

version 1.47, 2010/10/05 10:38:17 version 1.63, 2010/10/08 12:18:14
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))          dom = Parse(text)
         docinfo['numPages']=text('resultPage')          result= dom.xpath("//result/resultPage")
         logging.debug("documentViewer (characterNormalization) docinfo['numPages']: %s"%(docinfo['numPages']))          docinfo['numPages']=int(getTextFromNode(result[0]))
           return docinfo
       
       def getGisPlases(self, docinfo):
           """ Show all Gis Places of whole Page"""
           xpath='//place'
           text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'], xpath))
           pagedom = Parse(text)
           result =pagedom.xpath("//result/resultPage/place")
           docinfo['place']=getTextFromNode(result[0])
         return docinfo          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=""):
Line 194  class MpdlXmlTextServer(SimpleItem): Line 203  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/url=%s'%url)
   
                                #hrefNode.nodeValue=href.replace('chgis','')
                               l.setAttributeNS(None, 'target', '_blank')                                l.setAttributeNS(None, 'target', '_blank')
                   return serializeNode(pagenode)                    return serializeNode(pagenode)
                                           
Removed from v.1.47  
changed lines
  Added in v.1.63

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