--- documentViewer/MpdlXmlTextServer.py 2010/10/25 10:23:25 1.190 +++ documentViewer/MpdlXmlTextServer.py 2010/10/25 10:41:12 1.194 @@ -196,7 +196,7 @@ class MpdlXmlTextServer(SimpleItem): return originalPage - def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""): + def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""): """returns single page from fulltext""" docpath = docinfo['textURLPath'] path = docinfo['textURLPath'] @@ -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() @@ -212,10 +213,11 @@ class MpdlXmlTextServer(SimpleItem): textmode = "textPollux" else: textmode = mode - #logging.debug("documentViewer highlightQuery: %s"%(highlightQuery)) + 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) + 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)