Mercurial > hg > documentViewer
changeset 432:8d8f2cbd6213
*** empty log message ***
author | abukhman |
---|---|
date | Fri, 18 Feb 2011 12:21:46 +0100 |
parents | 630a4581992a |
children | 24fc850a35e6 |
files | MpdlXmlTextServer.py documentViewer.py zpt/page_main_thumbi.zpt |
diffstat | 3 files changed, 7 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/MpdlXmlTextServer.py Tue Feb 15 12:12:39 2011 +0100 +++ b/MpdlXmlTextServer.py Fri Feb 18 12:21:46 2011 +0100 @@ -176,14 +176,15 @@ return myList - def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None): + def getTextPage(self, mode="text_dict", pn=1, docinfo=None, pageinfo=None): """returns single page from fulltext""" docpath = docinfo['textURLPath'] path = docinfo['textURLPath'] url = docinfo.get('url',None) name = docinfo.get('name',None) pn =pageinfo['current'] - viewMode= pageinfo['viewMode'] + #viewMode= pageinfo['viewMode'] + sn = pageinfo['sn'] highlightQuery = pageinfo['highlightQuery'] #mode = pageinfo ['viewMode'] @@ -302,6 +303,7 @@ # plain text mode if mode == "text": # first div contains text + #mode = viewMode pagedivs = dom.xpath("/div") if len(pagedivs) > 0: pagenode = pagedivs[0] @@ -311,7 +313,7 @@ if hrefNode: href= hrefNode.nodeValue if href.startswith('#note-'): - hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,viewMode,tocMode,tocPN,pn)) + hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=text&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,tocMode,tocPN,pn)) return serializeNode(pagenode) if mode == "xml": # first div contains text @@ -343,6 +345,7 @@ # text-with-links mode if mode == "text_dict": # first div contains text + #mode = pageinfo ['viewMode'] pagedivs = dom.xpath("/div") if len(pagedivs) > 0: pagenode = pagedivs[0] @@ -369,25 +372,10 @@ 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, 'onClick', 'popupWin.focus();') if href.startswith('#note-'): - hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,viewMode,tocMode,tocPN,pn)) + hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=text_dict&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,tocMode,tocPN,pn)) return serializeNode(pagenode) return "no text here" - def getText(self, mode="text", pn=1, docinfo=None, pageinfo=None): - data = self.getTextPage(mode="text", pn=1 ,docinfo=docinfo, pageinfo=pageinfo) - logging.debug("TEXT ALL data: %s"%(data)) - return data - - def getXML(self, mode="xml", pn=1, docinfo=None, pageinfo=None): - data = self.getTextPage(mode="xml", pn=1 ,docinfo=docinfo, pageinfo=pageinfo) - logging.debug("TEXT ALL data: %s"%(data)) - return data - - def getDictionary(self, mode="text_dict", pn=1, docinfo=None, pageinfo=None): - data = self.getTextPage(mode="text_dict", pn=1 ,docinfo=docinfo, pageinfo=pageinfo) - logging.debug("TEXT ALL data: %s"%(data)) - return data - def getTranslate(self, query=None, language=None): """translate into another languages""" data = self.getServerData("lt/lex.xql","document=&language="+str(language)+"&query="+urllib.quote(query))
--- a/documentViewer.py Tue Feb 15 12:12:39 2011 +0100 +++ b/documentViewer.py Fri Feb 18 12:21:46 2011 +0100 @@ -231,18 +231,6 @@ """get page""" return self.template.fulltextclient.getTextPage(**args) - def getText(self, **args): - """get page text""" - return self.template.fulltextclient.getText(**args) - - def getXML(self, **args): - """get page xml""" - return self.template.fulltextclient.getXML(**args) - - def getDictionary(self, **args): - """get page dictionary""" - return self.template.fulltextclient.getDictionary(**args) - def getQuery(self, **args): """get query in search""" return self.template.fulltextclient.getQuery(**args)
--- a/zpt/page_main_thumbi.zpt Tue Feb 15 12:12:39 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -<tal:block tal:define="pageinfo python:options.get('pageinfo',None); docinfo python:options.get('docinfo',None) ;highlightQuery python:pageinfo.get('highlightQuery','');sn python:pageinfo.get('sn',''); characterNormalization python:pageinfo.get('characterNormalization',''); optionToggle python:pageinfo.get('optionToggle','');"> - <div tal:content="structure python:pageinfo['textPage']"></div> -</tal:block> \ No newline at end of file