--- documentViewer/documentViewer.py	2010/05/10 13:22:16	1.51
+++ documentViewer/documentViewer.py	2010/05/20 09:28:36	1.55
@@ -667,9 +667,9 @@ class documentViewer(Folder):
         pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')
         
         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', '20')
+        pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '10')
         pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1')
         toc = int (pageinfo['tocPN'])
         pageinfo['textPages'] =int (toc)
@@ -699,12 +699,14 @@ class documentViewer(Folder):
         pagesize = pageinfo['queryPageSize']
         pn = pageinfo['searchPN']
         sn = pageinfo['sn']
+        highlightQuery = pageinfo['highlightQuery']
         query =pageinfo['query']
         queryType =pageinfo['queryType']
         viewMode=  pageinfo['viewMode']
         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)                
         pagexml = page.replace('?document=%s'%str(docpath),'?url=%s'%url)
         pagedom = Parse(pagexml)
@@ -722,8 +724,9 @@ class documentViewer(Folder):
                             #l.setAttributeNS(None, "span class = 'hit highlight'", "background-color: #77DD77;")            
                             pagexml=href.replace('mode=text','mode=texttool&viewMode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&tocMode=%s&searchPN=%s&tocPN=%s'%(viewMode,queryType,query,pagesize,pn,tocMode,pn,tocPN))
                             hrefNode.nodeValue = pagexml.replace('page-fragment.xql','%s'%selfurl)                                          
-                            l.setAttributeNS(None, "onClick", "id='highlighting'")  
-                              
+                            l.setAttributeNS(None, "onClick", "id='highlighting'") 
+                            logging.debug("documentViewer (gettoc) highlightQuery: %s"%(highlightQuery))
+                            l.setAttributeNS(None, "highlightQuery", "id='highlighting'") 
                 return serializeNode(pagenode)
         
         if (queryType=="fulltextMorph"):
@@ -760,14 +763,14 @@ class documentViewer(Folder):
                         hrefNode.nodeValue=href.replace('mode=text','mode=texttool&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s'%(viewMode,tocMode,tocPN,pn))
                        
                         if href.startswith('../lt/lex.xql'):
-                            selfurl = self.absolute_url()
-                            hrefNode.nodeValue = href.replace('lt/lex.xql','%s/template/head_main_voc'%selfurl)         
+                           # selfurl = self.absolute_url()
+                            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;")
                             l.setAttributeNS(None, 'onDblclick', 'popupWin.focus();')
                         if href.startswith('../lt/lemma.xql'):
-                            selfurl = self.absolute_url()
-                            hrefNode.nodeValue = href.replace('lt/lemma.xql','%s/template/head_main_lemma'%selfurl)        
+                            #selfurl = self.absolute_url()
+                            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;")
                             l.setAttributeNS(None, 'onDblclick', 'popupWin.focus();')
@@ -804,7 +807,16 @@ class documentViewer(Folder):
             pagedivs = pagedom.xpath("/div")
             #queryResultPage
             if len(pagedivs) > 0:
+               
                 pagenode = pagedivs[0]
+                links = pagenode.xpath("//a")
+                for l in links:
+                    hrefNode = l.getAttributeNodeNS(None, u"href")
+                    if hrefNode:
+                        href= hrefNode.nodeValue
+                        if href.startswith('#note-0006-01'):
+                            selfurl = self.absolute_url()
+                            hrefNode.nodeValue = href.replace("href='#note-'",'xaxa/%s/'%selfurl)
                 return serializeNode(pagenode)
         if mode == "xml":
               # first div contains text
@@ -871,7 +883,7 @@ class documentViewer(Folder):
          pagedom = Parse(pagexml)
          numdivs = pagedom.xpath("//div[@class='queryResultHits']")
          tocSearch = int(getTextFromNode(numdivs[0]))
-         tc=int((tocSearch/20)+1)
+         tc=int((tocSearch/10)+1)
          logging.debug("documentViewer (gettoc) tc: %s"%(tc))
          return tc