Changeset 106:9f11913bc132 in documentViewer

Timestamp:

May 20, 2010, 9:28:36 AM (14 years ago)

Author:

abukhman

Branch:

default

Message:

* empty log message *

File:

• documentViewer.py (modified) (5 diffs)

documentViewer.py

@@ -668 +668 @@
         
         pageinfo['textPN'] = self.REQUEST.get('textPN','1')
-        
+        pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','')
         pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30')
         pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10')
@@ -700 +700 @@
         pn = pageinfo['searchPN']
         sn = pageinfo['sn']
+        highlightQuery = pageinfo['highlightQuery']
         query =pageinfo['query']
         queryType =pageinfo['queryType']
@@ -725 +726 @@
                             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'") 
                 return serializeNode(pagenode)
@@ -763 +765 @@
                         if href.startswith('../lt/lex.xql'):
                            # selfurl = self.absolute_url()
-                            hrefNode.nodeValue = href.replace('../lt/lex.xql','%s../template/head_main_voc'%selfurl)         
+                            hrefNode.nodeValue = href.replace('../lt/lex.xql','%s/template/head_main_voc'%selfurl)         
                             l.setAttributeNS(None, 'target', '_blank')
                             l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=400, scrollbars=1'); return false;")
@@ -769 +771 @@
                         if href.startswith('../lt/lemma.xql'):
                             #selfurl = self.absolute_url()
-                            hrefNode.nodeValue = href.replace('../lt/lemma.xql','%s../template/head_main_lemma'%selfurl)        
+                            hrefNode.nodeValue = href.replace('../lt/lemma.xql','%s/template/head_main_lemma'%selfurl)        
                             l.setAttributeNS(None, 'target', '_blank')
                             l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=400, scrollbars=1'); return false;")