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

Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.64 and 1.117

version 1.64, 2010/10/08 12:21:40 version 1.117, 2010/10/14 10:27:53
Line 140  class MpdlXmlTextServer(SimpleItem): Line 140  class MpdlXmlTextServer(SimpleItem):
         docinfo['numPages']=int(getTextFromNode(result[0]))          docinfo['numPages']=int(getTextFromNode(result[0]))
         return docinfo          return docinfo
           
     def getGisPlases(self, docinfo):      def getGisPlaces(self, docinfo=None, pageinfo=None):
         """ Show all Gis Places of whole Page"""          """ Show all Gis Places of whole Page"""
         xpath='//place'          xpath='//place'
         text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'], xpath))          docpath = docinfo['textURLPath'] 
         pagedom = Parse(text)          url = docinfo['url']
         result =pagedom.xpath("//result/resultPage/place")          selfurl = self.absolute_url()
         docinfo['place']=getTextFromNode(result[0])          pn = pageinfo['current']
         return docinfo          
           text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'],xpath,pn))
           dom = Parse(text)
           result = dom.xpath("//result/resultPage/place")
           for l in result:
               hrefNode= l.getAttributeNodeNS(None, u"id")
               href= hrefNode.nodeValue
               for l in href:
                   href1 = append(href)
                   logging.debug("getGisPlaces :%s"%(href1))
               #logging.debug("getGisPlaces :%s"%(href))
                   #if href.startswith('id='):
                       #hrefNode.nodeValue = href.replace('id=',"?")   
                       #logging.debug("documentViewer getGisPlaces (characterNormalization) hrefNode.nodeValue:%s"%(hrefNode.nodeValue))
           logging.debug("getGisPlaces :%s"%(href))                            
           return href
           
     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 203  class MpdlXmlTextServer(SimpleItem): Line 219  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/REST/db/chgis/mpdl','chinagis/REST/db/mpdl/%s'%url)                                hrefNode.nodeValue =href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl/%s'%name)
   
                              #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.64  
changed lines
  Added in v.1.117

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