Diff for /documentViewer/MpdlXmlTextServer.py between versions 1.85 and 1.120

version 1.85, 2010/10/11 15:54:24 version 1.120, 2010/10/14 10:44:01
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'
           docpath = docinfo['textURLPath'] 
           url = docinfo['url']
           selfurl = self.absolute_url()
           pn = pageinfo['current']
           
         text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'], xpath,pn))          text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'], xpath,pn))
         pagedom = Parse(text)          dom = Parse(text)
         result =pagedom.xpath("//result/resultPage")          result = dom.xpath("//result/resultPage/place")
         for l in result:          for l in result:
             hrefNode= l.getAttributeNodeNS(None, u"place")              hrefNode= l.getAttributeNodeNS(None, u"id")
             logging.debug("documentViewer (characterNormalization) l:%s"%(l))  
             if hrefNode:  
                 href= hrefNode.nodeValue                  href= hrefNode.nodeValue
                 if href.startswith('id='):              for i in href:
                     hrefNode.nodeValue = href.replace('id=',"?")                  href = ",".join(href)
                                                   logging.debug("getGisPlaces :%s"%(href1))
         return serializeNode(pagenode)              #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"""

Removed from v.1.85  
changed lines
  Added in v.1.120


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