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

Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.62 and 1.74

version 1.62, 2010/10/08 12:15:45 version 1.74, 2010/10/11 14:04:21
Line 145  class MpdlXmlTextServer(SimpleItem): Line 145  class MpdlXmlTextServer(SimpleItem):
         xpath='//place'          xpath='//place'
         text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'], xpath))          text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'], xpath))
         pagedom = Parse(text)          pagedom = Parse(text)
         result =pagedom.xpath("//result/resultPage/place")          result =pagedom.xpath("//result/resultPage/")
           for l in result:
               hrefNode= l.getAttributeNodeNS(None, u"id")
         docinfo['place']=getTextFromNode(result[0])          docinfo['place']=getTextFromNode(result[0])
         return docinfo          return docinfo
           
Line 154  class MpdlXmlTextServer(SimpleItem): Line 156  class MpdlXmlTextServer(SimpleItem):
         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 206  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'%selfurl)                                hrefNode.nodeValue =href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl/name=%s'%name)
                                #hrefNode.nodeValue =href.replace('chinagis_REST/REST/db/chgis/mpdl','chinagis/REST/db/mpdl%s'%url)
                              #hrefNode.nodeValue=href.replace('chgis','')                                logging.debug("YYYYY docinfo[name] %s"%docinfo['name'])
                               l.setAttributeNS(None, 'target', '_blank')                                 l.setAttributeNS(None, 'target', '_blank') 
                   return serializeNode(pagenode)                    return serializeNode(pagenode)
                                           
Removed from v.1.62  
changed lines
  Added in v.1.74

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