--- documentViewer/MpdlXmlTextServer.py 2011/07/29 10:33:17 1.241 +++ documentViewer/MpdlXmlTextServer.py 2011/08/31 13:55:07 1.242 @@ -198,6 +198,7 @@ class MpdlXmlTextServer(SimpleItem): highlightQuery = pageinfo['highlightQuery'] #mode = pageinfo ['viewMode'] tocMode = pageinfo['tocMode'] + xpointer = pageinfo['xpointer'] characterNormalization=pageinfo['characterNormalization'] tocPN = pageinfo['tocPN'] selfurl = self.absolute_url() @@ -206,7 +207,7 @@ class MpdlXmlTextServer(SimpleItem): else: 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) textParam +="&highlightQuery=%s&s=%s&highlightElement=%s&highlightElementPos=%s"%(urllib.quote(highlightQuery),s, highlightElement, highlightElementPos) @@ -319,6 +320,7 @@ class MpdlXmlTextServer(SimpleItem): href= hrefNode.nodeValue 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": # first div contains text