Mercurial > hg > documentViewer
changeset 162:e6f0553ad176
characterNormalization
author | abukhman |
---|---|
date | Tue, 24 Aug 2010 12:47:37 +0200 |
parents | 1e1733fbe286 |
children | 06bb2a289068 |
files | MpdlXmlTextServer.py zpt/page_main_gis.zpt zpt/page_main_text.zpt zpt/page_main_text_dict.zpt |
diffstat | 4 files changed, 11 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/MpdlXmlTextServer.py Tue Aug 24 12:17:06 2010 +0200 +++ b/MpdlXmlTextServer.py Tue Aug 24 12:47:37 2010 +0200 @@ -137,14 +137,14 @@ url = docinfo['url'] viewMode= pageinfo['viewMode'] tocMode = pageinfo['tocMode'] - characterNormalization = pageinfo ['characterNormalization'] + #characterNormalization = pageinfo ['characterNormalization'] tocPN = pageinfo['tocPN'] selfurl = self.absolute_url() if mode == "text_dict": textmode = "textPollux" else: textmode = mode - logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization)) + #logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization)) textParam = "document=%s&mode=%s&pn=%s"%(docpath,textmode,pn) if highlightQuery is not None: textParam +="&highlightQuery=%s&sn=%s"%(highlightQuery,sn) @@ -165,7 +165,7 @@ if hrefNode: href= hrefNode.nodeValue if href.startswith('#note-'): - hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=%s&tocMode=%s&characterNormalization=%s&tocPN=%s&pn=%s#note-"%(url,viewMode,tocMode,characterNormalization,tocPN,pn)) + hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,viewMode,tocMode,tocPN,pn)) return serializeNode(pagenode) if mode == "xml": # first div contains text @@ -215,7 +215,7 @@ 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&characterNormalization=%s&tocPN=%s&pn=%s#note-"%(url,viewMode,tocMode,characterNormalization,tocPN,pn)) + hrefNode.nodeValue = href.replace('#note-',"?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&pn=%s#note-"%(url,viewMode,tocMode,tocPN,pn)) return serializeNode(pagenode) return "no text here" @@ -302,16 +302,15 @@ url = docinfo['url'] selfurl = self.absolute_url() viewMode= pageinfo['viewMode'] - characterNormalization =pageinfo ['characterNormalization'] + #characterNormalization =pageinfo ['characterNormalization'] tocMode = pageinfo['tocMode'] tocPN = pageinfo['tocPN'] data = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s"%(docpath,queryType, pagesize, pn)) - - page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s&characterNormalization=%s'%(selfurl,url, viewMode, tocMode, tocPN, characterNormalization)) + page = data.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') - logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization)) - logging.debug("documentViewer (characterNormalization) text: %s"%(text)) + #logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization)) + #logging.debug("documentViewer (characterNormalization) text: %s"%(text)) return text def manage_changeMpdlXmlTextServer(self,title="",serverUrl="http://mpdl-proto.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):
--- a/zpt/page_main_gis.zpt Tue Aug 24 12:17:06 2010 +0200 +++ b/zpt/page_main_gis.zpt Tue Aug 24 12:47:37 2010 +0200 @@ -1,4 +1,4 @@ -<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','') "> +<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','');"> <div tal:content="structure python:here.getTextPage(mode='gis',pn=pageinfo['current'],docinfo=docinfo, highlightQuery=highlightQuery, sn=sn, pageinfo=pageinfo, characterNormalization=characterNormalization)"></div> </tal:block> \ No newline at end of file
--- a/zpt/page_main_text.zpt Tue Aug 24 12:17:06 2010 +0200 +++ b/zpt/page_main_text.zpt Tue Aug 24 12:47:37 2010 +0200 @@ -1,4 +1,4 @@ -<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','')"> +<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','');"> <div tal:content="structure python:here.getTextPage(mode='text',pn=pageinfo['current'],docinfo=docinfo, highlightQuery=highlightQuery, sn=sn, pageinfo=pageinfo, characterNormalization=characterNormalization)"></div> </tal:block> \ No newline at end of file
--- a/zpt/page_main_text_dict.zpt Tue Aug 24 12:17:06 2010 +0200 +++ b/zpt/page_main_text_dict.zpt Tue Aug 24 12:47:37 2010 +0200 @@ -1,3 +1,3 @@ -<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','')"> +<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','');"> <div tal:content="structure python:here.getTextPage(mode='text_dict',pn=pageinfo['current'],docinfo=docinfo, highlightQuery=highlightQuery, sn=sn, pageinfo=pageinfo, characterNormalization=characterNormalization)"></div> </tal:block> \ No newline at end of file