--- documentViewer/MpdlXmlTextServer.py 2010/10/18 12:42:29 1.186 +++ documentViewer/MpdlXmlTextServer.py 2010/10/25 10:22:15 1.189 @@ -203,6 +203,7 @@ class MpdlXmlTextServer(SimpleItem): url = docinfo['url'] name = docinfo['name'] viewMode= pageinfo['viewMode'] + highlightQuery = pageinfo['highlightQuery'] tocMode = pageinfo['tocMode'] characterNormalization=pageinfo['characterNormalization'] tocPN = pageinfo['tocPN'] @@ -211,10 +212,10 @@ class MpdlXmlTextServer(SimpleItem): textmode = "textPollux" else: textmode = mode - #logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization)) + 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) pagexml = self.getServerData("page-fragment.xql",textParam) #pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", textParam, outputUnicode=False)