Changeset 99:4738a696d265 in documentViewer

Timestamp:

Apr 30, 2010, 2:36:00 PM (15 years ago)

Author:

abukhman

Branch:

default

Message:

Search function update

File:

• documentViewer.py (modified) (10 diffs)

documentViewer.py

@@ -97 +97 @@
     page_main_text = PageTemplateFile('zpt/page_main_text', globals())
     page_main_text_dict = PageTemplateFile('zpt/page_main_text_dict', globals())
+    page_main_xml = PageTemplateFile('zpt/page_main_xml', globals())
     head_main = PageTemplateFile('zpt/head_main', globals())
     docuviewer_css = PageTemplateFile('css/docuviewer.css', globals())
@@ -173 +174 @@
         @param url: url which contains display information
         @param viewMode: if images display images, if text display text, default is auto (text,images or auto)
-        @param tocMode: type of 'table of contents' for navigation (thumbs, text, figures, search)
+        @param tocMode: type of 'table of contents' for navigation (thumbs, text, figures, none)
         @param querySearch: type of different search modes (fulltext, fulltextMorph, xpath, xquery, ftIndex, ftIndexMorph)
         '''
@@ -654 +655 @@
             if np % grpsize > 0:
                 pageinfo['numgroups'] += 1
-                
+        
+          
         pageinfo['viewMode'] = viewMode
         pageinfo['tocMode'] = tocMode
@@ -660 +662 @@
         pageinfo['queryType'] = self.REQUEST.get('queryType',' ')
         pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')
+        
+        pageinfo['textPN'] = self.REQUEST.get('textPN','1')
+        
         pageinfo['tocPageSize'] = self.REQUEST.get('tocPageSize', '30')
         pageinfo['queryPageSize'] =self.REQUEST.get('queryPageSize', '20')
         pageinfo['tocPN'] = self.REQUEST.get('tocPN', '1')
-        #if 'tocSize_%s'%tocMode in docinfo:
+        toc = int (pageinfo['tocPN'])
+        pageinfo['textPages'] =int (toc)
+        
+        if 'tocSize_%s'%tocMode in docinfo:
+            tocSize = int(docinfo['tocSize_%s'%tocMode])
+            tocPageSize = int(pageinfo['tocPageSize'])
             # cached toc
-          # pageinfo['tocPN'] = min (int (docinfo['tocSize_%s'%tocMode])/int(pageinfo['tocPageSize']),int(pageinfo['tocPN']))
-               
+           
+            if tocSize%tocPageSize>0:
+                tocPages=tocSize/tocPageSize+1
+            else:
+                tocPages=tocSize/tocPageSize
+            pageinfo['tocPN'] = min (tocPages,toc)
+                     
         pageinfo['searchPN'] =self.REQUEST.get('searchPN','1')
         pageinfo['sn'] =self.REQUEST.get('sn','1')
@@ -683 +698 @@
         tocMode = pageinfo['tocMode']
         tocPN = pageinfo['tocPN']
-        pagexml=self.template.fulltextclient.eval("/mpdl/interface/doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s"%(docpath, 'text', queryType, query, pagesize, pn, sn) ,outputUnicode=False)           
+        
+        page=self.template.fulltextclient.eval("/mpdl/interface/doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s"%(docpath, 'text', queryType, query, pagesize, pn, sn) ,outputUnicode=False)                
+        pagexm = page.replace('?document=/echo/la/Benedetti_1585.xml','?url=/mpiwg/online/permanent/library/163127KK')
+        pagexml=pagexm.replace('mode=text','mode=texttool')
         pagedom = Parse(pagexml)
-        pagedivs = pagedom.xpath("//div[@class='queryResultPage']")
-        
-        selfurl = self.absolute_url()
-        
-        page = pagexml.replace('page-fragment.xql?document=/echo/la/Benedetti_1585.xml','%s?url=/mpiwg/online/permanent/library/163127KK&viewMode=%s&tocMode=%s&tocPN=%s&query=%s&queryType=%s'%(selfurl, viewMode, tocMode, tocPN, query, queryType))
-        text =page.replace('mode=text','mode=texttool')
-        href = text.replace('lt/lex.xql','%s/template/head_main_voc'%selfurl)
-        lemma= href.replace('lt/lemma.xql','%s/template/head_main_lemma'%selfurl)
-        #logging.debug("documentViewer (gettoc) lemma: %s"%(lemma))
-        
-        return lemma
+        
+        if (queryType=="fulltext")or(queryType=="fulltextMorph")or(queryType=="xpath")or(queryType=="xquery"):
+            pagedivs = pagedom.xpath("//div[@class='queryResultPage']")
+            selfurl = self.absolute_url()
+            page = pagexml.replace('page-fragment.xql?document=/echo/la/Benedetti_1585.xml','%s?url=/mpiwg/online/permanent/library/163127KK&viewMode=%s&tocMode=%s&tocPN=%s&query=%s&queryType=%s'%(selfurl, viewMode, tocMode, tocPN, query, queryType))
+            text =page.replace('mode=text','mode=texttool')
+            return text
+        
+        if (queryType=="ftIndex")or(queryType=="ftIndexMorph"):
+            pagedivs= pagedom.xpath("//div[@class='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('../lt/lex.xql'):
+                            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=200, 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)        
+                            l.setAttributeNS(None, 'target', '_blank')
+                            l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=200, scrollbars=1'); return false;")
+                            l.setAttributeNS(None, 'onDblclick', 'popupWin.focus();')
+                return serializeNode(pagenode)
+        
+        return "no text here"   
                        
-    
-        #if len(pagedivs) > 0:
-        #    pagenode = pagedom[0]
-        #    return serializeNode(pagenode)
-        #else:
-        #    return "xaxa"
-
     def getNumPages(self,docinfo=None):
         """get list of pages from fulltext and put in docinfo"""
@@ -726 +761 @@
   
         pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", "document=%s&mode=%s&pn=%s"%(docpath,textmode,pn), outputUnicode=False)
-        #######
-        #page = pagexml.replace('page-fragment.xql?document=/echo/la/Benedetti_1585.xml','%s?url=/mpiwg/online/permanent/library/163127KK&viewMode=%s&tocMode=%s&tocPN=%s'%(selfurl, viewMode, tocMode, tocPN))
-        #text =page.replace('mode=text','mode=texttool')
-        #######
         # post-processing downloaded xml
         pagedom = Parse(pagexml)
@@ -740 +771 @@
                 pagenode = pagedivs[0]
                 return serializeNode(pagenode)
-
+        if mode == "xml":
+              # first div contains text
+              pagedivs = pagedom.xpath("/div")
+              if len(pagedivs) > 0:
+                  pagenode = pagedivs[0]
+                  return serializeNode(pagenode)
         # text-with-links mode
         if mode == "text_dict":
@@ -761 +797 @@
                             # add target
                             l.setAttributeNS(None, 'target', '_blank')
+                            l.setAttributeNS(None, 'onClick',"popupWin = window.open(this.href, 'contacts', 'location,width=500,height=600,top=180, left=700, scrollbars=1'); return false;")
+                            l.setAttributeNS(None, 'onDblclick', 'popupWin.focus();')
                             
                         if href.startswith('lt/lemma.xql'):    
@@ -766 +804 @@
                             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=700, scrollbars=1'); return false;")
+                            l.setAttributeNS(None, 'onDblclick', 'popupWin.focus();')
                 return serializeNode(pagenode)
         
@@ -776 +816 @@
     
     def getLemma(self, lemma=None, language=None):
-        """lemma"""
+        """simular words lemma """
         pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lemma.xql","lemma=%s&language=%s"%(lemma,language),outputUnicode=False)
         return pagexml