--- documentViewer/MpdlXmlTextServer.py 2010/10/25 10:22:15 1.189 +++ documentViewer/MpdlXmlTextServer.py 2010/10/25 10:42:00 1.195 @@ -205,6 +205,7 @@ class MpdlXmlTextServer(SimpleItem): viewMode= pageinfo['viewMode'] highlightQuery = pageinfo['highlightQuery'] tocMode = pageinfo['tocMode'] + sn =pageinfo['sn'] characterNormalization=pageinfo['characterNormalization'] tocPN = pageinfo['tocPN'] selfurl = self.absolute_url() @@ -214,9 +215,10 @@ class MpdlXmlTextServer(SimpleItem): textmode = mode logging.debug("documentViewer highlightQuery: %s"%(highlightQuery)) textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s"%(docpath,textmode,pn,characterNormalization) - #if highlightQuery is not None: - # textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(highlightQuery),sn) - + if highlightQuery is not None: + textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(highlightQuery),sn) + #textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s&highlightQuery=%s&sn=%s"%(docpath,textmode,pn,characterNormalization, highlightQuery, sn) + logging.debug("documentViewer highlightQuery: %s"%(highlightQuery)) pagexml = self.getServerData("page-fragment.xql",textParam) #pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", textParam, outputUnicode=False)