Mercurial > hg > documentViewer

changeset 107:53c395d3175f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author abukhman
date Thu, 20 May 2010 16:19:31 +0200
parents 9f11913bc132
children 726a71254086
files documentViewer.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/documentViewer.py	Thu May 20 11:28:36 2010 +0200
+++ b/documentViewer.py	Thu May 20 16:19:31 2010 +0200
@@ -706,8 +706,8 @@
         tocMode = pageinfo['tocMode']
         tocPN = pageinfo['tocPN']
         selfurl = self.absolute_url()
-        logging.debug("documentViewer (gettoc) /mpdl/interface/doc-query.xql?document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s&viewMode=%s"%(docpath, 'text', queryType, query, pagesize, pn, sn, viewMode))
-        page=self.template.fulltextclient.eval("/mpdl/interface/doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s&viewMode=%s"%(docpath, 'text', queryType, query, pagesize, pn, sn, viewMode) ,outputUnicode=False)                
+       # logging.debug("documentViewer (gettoc) /mpdl/interface/doc-query.xql?document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s&viewMode=%s"%(docpath, 'text', queryType, query, pagesize, pn, sn, viewMode))
+        page=self.template.fulltextclient.eval("/mpdl/interface/doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s&viewMode=%s&highlightQuery=%s"%(docpath, 'text', queryType, query, pagesize, pn, sn, viewMode,highlightQuery) ,outputUnicode=False)                
         pagexml = page.replace('?document=%s'%str(docpath),'?url=%s'%url)
         pagedom = Parse(pagexml)
         if (queryType=="fulltext")or(queryType=="xpath")or(queryType=="xquery")or(queryType=="fulltextMorphLemma"):   
@@ -726,7 +726,7 @@
                             hrefNode.nodeValue = pagexml.replace('page-fragment.xql','%s'%selfurl)                                          
                             l.setAttributeNS(None, "onClick", "id='highlighting'") 
                             logging.debug("documentViewer (gettoc) highlightQuery: %s"%(highlightQuery))
-                            l.setAttributeNS(None, "highlightQuery", "id='highlighting'") 
+                            l.setAttributeNS(None, highlightQuery, "id='highlighting'") 
                 return serializeNode(pagenode)
         
         if (queryType=="fulltextMorph"):