# HG changeset patch
# User abukhman
# Date 1286811951 -7200
# Node ID 437d697a40e569f429b502f62509f9db8c9e7176
# Parent  7f089a0cb189e1abd7e33c221b718cd8c0b43ee1
*** empty log message ***

diff -r 7f089a0cb189 -r 437d697a40e5 MpdlXmlTextServer.py
--- a/MpdlXmlTextServer.py	Mon Oct 11 17:06:33 2010 +0200
+++ b/MpdlXmlTextServer.py	Mon Oct 11 17:45:51 2010 +0200
@@ -145,17 +145,15 @@
         xpath='//place'
         text=self.getServerData("xpath.xql", "document=%s&xpath=%s&pn=%s"%(docinfo['textURLPath'], xpath,pn))
         pagedom = Parse(text)
-        result =pagedom.xpath("//result/resultPage/")
+        result =pagedom.xpath("//result/resultPage/place")
         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
                 if href.startswith('id='):
-                    hrefNode.nodeValue = href.replace('id=',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%sid="%(url,viewMode,tocMode,tocPN,pn))
-                    logging.debug("YYYY href%s"%href)
-                    logging.debug("YYYY serializeNode(pagenode)%s"%serializeNode(pagenode))
-                    logging.debug("YYYY hrefNode.nodeValue%s"%hrefNode.nodeValue)
-        logging.debug("YYYY serializeNode(pagenode)%s"%serializeNode(pagenode))            
+                    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=""):