Changeset 449:6c11f3ec8698 in documentViewer

Timestamp:

Aug 31, 2011, 1:55:17 PM (13 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

Files:

• MpdlXmlTextServer.py (modified) (3 diffs)
• documentViewer.py (modified) (1 diff)

MpdlXmlTextServer.py

@@ -199 +199 @@
         #mode = pageinfo ['viewMode']
         tocMode = pageinfo['tocMode']
+        xpointer = pageinfo['xpointer']
         characterNormalization=pageinfo['characterNormalization']
         tocPN = pageinfo['tocPN']
@@ -207 +208 @@
             textmode = mode
         
-        textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s"%(docpath,textmode,pn,characterNormalization)
+        textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s&options=withXmlNodeId&xpointer=%s"%(docpath,textmode,pn,characterNormalization, xpointer)
         if highlightQuery is not None:
             #textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(highlightQuery),sn)
@@ -320 +321 @@
                         if href.startswith('#note-'):
                             hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=text&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,tocMode,tocPN,pn))
+                        #if href.startswith():
                 return serializeNode(pagenode)
         if mode == "xml":

documentViewer.py

@@ -920 +920 @@
         pageinfo ['highlightElement'] = self.REQUEST.get('highlightElement','')
         
+        pageinfo ['xpointer'] = self.REQUEST.get('xpointer','')
         
         pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30')