Changeset 108:726a71254086 in documentViewer

Timestamp:

May 21, 2010, 9:33:44 AM (14 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

File:

• documentViewer.py (modified) (3 diffs)

documentViewer.py

@@ -666 +666 @@
         pageinfo['queryType'] = self.REQUEST.get('queryType',' ')
         pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')
-        
+        pageinfo['sn'] = self.REQUEST.get('sn','')
         pageinfo['textPN'] = self.REQUEST.get('textPN','1')
         pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','')
@@ -786 +786 @@
         return docinfo
        
-    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None,):
+    def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, highlightQuery=None,sn=None):
         """returns single page from fulltext"""
         docpath = docinfo['textURLPath']
+        #pageinfo = pageinfo['highlightQuery']
         if mode == "text_dict":
             textmode = "textPollux"
@@ -799 +800 @@
         #tocPN = pageinfo['tocPN']
   
-        pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", "document=%s&mode=%s&pn=%s"%(docpath,textmode,pn), outputUnicode=False)
+        pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", "document=%s&mode=%s&pn=%s&highlightQuery=%s&sn=%s"%(docpath,textmode,pn,highlightQuery,sn), outputUnicode=False)
+        logging.debug("documentViewer (gettoc) document=%s&mode=%s&pn=%s&highlightQuery=%s"%(docpath,textmode,pn,highlightQuery))
         # post-processing downloaded xml
         pagedom = Parse(pagexml)