Changeset 103:daedc22e4e76 in documentViewer

Timestamp:

May 19, 2010, 4:19:45 PM (14 years ago)

Author:

abukhman

Branch:

default

Message:

last update

File:

• documentViewer.py (modified) (4 diffs)

documentViewer.py

@@ -706 +706 @@
         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)
@@ -723 +724 @@
                             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'")              
                 return serializeNode(pagenode)
         
@@ -761 +761 @@
                        
                         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;")
@@ -805 +805 @@
             #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":