Mercurial > hg > documentViewer

changeset 101:a839579233c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update for all Books(not for only Benedetti)
author abukhman
date Fri, 07 May 2010 16:11:49 +0200
parents 137459e3b378
children 27513c893ba9
files documentViewer.py
diffstat 1 files changed, 16 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/documentViewer.py	Wed May 05 17:42:56 2010 +0200
+++ b/documentViewer.py	Fri May 07 16:11:49 2010 +0200
@@ -2,6 +2,7 @@
 from OFS.Folder import Folder
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile 
+from Products.PythonScripts.standard import url_quote
 from AccessControl import ClassSecurityInfo
 from AccessControl import getSecurityManager
 from Globals import package_home
@@ -689,6 +690,9 @@
     def getSearch(self, pn=1, pageinfo=None,  docinfo=None, query=None, queryType=None):
         """get search list"""
         docpath = docinfo['textURLPath'] 
+        url = docinfo['url']
+        logging.debug("documentViewer (gettoc) docpath: %s"%(docpath))
+        logging.debug("documentViewer (gettoc) url: %s"%(url))
         pagesize = pageinfo['queryPageSize']
         pn = pageinfo['searchPN']
         sn = pageinfo['sn']
@@ -699,10 +703,8 @@
         tocPN = pageinfo['tocPN']
         selfurl = self.absolute_url()
         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=/echo/la/Benedetti_1585.xml','?url=/mpiwg/online/permanent/library/163127KK')
-        #hrefNode.nodeValue =pagexml.replace('mode=text','%s&mode=texttool'%selfurl)
+        pagexml = page.replace('?document=%s'%str(docpath),'?url=%s'%url)
         pagedom = Parse(pagexml)
-        #logging.debug("documentViewer (gettoc) pagedom: %s"%(pagedom))
         if (queryType=="fulltext")or(queryType=="xpath")or(queryType=="xquery")or(queryType=="fulltextMorphLemma"):   
             pagedivs = pagedom.xpath("//div[@class='queryResultPage']")
             if len(pagedivs)>0:
@@ -716,8 +718,9 @@
                             selfurl = self.absolute_url()
                             #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, "span class = 'hit'", "background-color: #77DD77;")      
+                            hrefNode.nodeValue = pagexml.replace('page-fragment.xql','%s'%selfurl)                                          
+                            l.setAttributeNS(None, "onClick", "id='highlighting'")  
+                              
                 return serializeNode(pagenode)
         
         if (queryType=="fulltextMorph"):
@@ -766,7 +769,7 @@
                             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();')
                 return serializeNode(pagenode)      
-        return "xexe"   
+        return "no text here"   
                        
     def getNumPages(self,docinfo=None):
         """get list of pages from fulltext and put in docinfo"""
@@ -841,12 +844,13 @@
 
     def getTranslate(self, query=None, language=None):
         """translate into another languages"""
-        pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lex.xql","query=%s&language=%s"%(query,language),outputUnicode=False)
+        pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lex.xql","document=&language="+str(language)+"&query="+url_quote(str(query)))
         return pagexml
     
     def getLemma(self, lemma=None, language=None):
         """simular words lemma """
-        pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lemma.xql","lemma=%s&language=%s"%(lemma,language),outputUnicode=False)
+        pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lemma.xql","document=&language="+str(language)+"&lemma="+url_quote(str(lemma)))
+        #pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lemma.xql","lemma=%s&language=%s"%(lemma,language),outputUnicode=False)
         return pagexml
 
     def getQuery (self,  docinfo=None, pageinfo=None, query=None, queryType=None, pn=1):
@@ -909,16 +913,18 @@
         else:
             queryType = mode
         docpath = docinfo['textURLPath']
+        path = docinfo['textURLPath']
+        #logging.debug("documentViewer (gettoc) pathNomer: %s"%(pathNomer))
         pagesize = pageinfo['tocPageSize']
         pn = pageinfo['tocPN']
-        
+        url = docinfo['url']
         selfurl = self.absolute_url()  
         viewMode=  pageinfo['viewMode']
         tocMode = pageinfo['tocMode']
         tocPN = pageinfo['tocPN']
     
         pagexml=self.template.fulltextclient.eval("/mpdl/interface/doc-query.xql", "document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s"%(docpath,queryType, pagesize, 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))
+        page = pagexml.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s'%(selfurl,url, viewMode, tocMode, tocPN))
         text = page.replace('mode=image','mode=texttool')
         return text
         # post-processing downloaded xml