Mercurial > hg > documentViewer
changeset 376:4f381768909a
*** empty log message ***
| author | abukhman |
|---|---|
| date | Mon, 25 Oct 2010 12:49:04 +0200 |
| parents | b576a54bf8eb |
| children | faffd92fcdd0 |
| files | MpdlXmlTextServer.py |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/MpdlXmlTextServer.py Mon Oct 25 12:42:00 2010 +0200 +++ b/MpdlXmlTextServer.py Mon Oct 25 12:49:04 2010 +0200 @@ -196,16 +196,17 @@ 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, highlightQuery=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization=""): """returns single page from fulltext""" docpath = docinfo['textURLPath'] path = docinfo['textURLPath'] url = docinfo['url'] name = docinfo['name'] viewMode= pageinfo['viewMode'] + sn = pageinfo['sn'] highlightQuery = pageinfo['highlightQuery'] + tocMode = pageinfo['tocMode'] - sn =pageinfo['sn'] characterNormalization=pageinfo['characterNormalization'] tocPN = pageinfo['tocPN'] selfurl = self.absolute_url() @@ -213,11 +214,10 @@ 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 = "document=%s&mode=%s&pn=%s&characterNormalization=%s&highlightQuery=%s&sn=%s"%(docpath,textmode,pn,characterNormalization, highlightQuery, sn) + textParam +="&highlightQuery=%s&sn=%s"%(urllib.quote(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)