comparison MpdlXmlTextServer.py @ 171:77d5ff742bb4

characterNormalization
author abukhman
date Tue, 24 Aug 2010 16:04:21 +0200
parents caf66e1fccd3
children 11cb88e7f523
comparison
equal deleted inserted replaced
170:caf66e1fccd3 171:77d5ff742bb4
143 if mode == "text_dict": 143 if mode == "text_dict":
144 textmode = "textPollux" 144 textmode = "textPollux"
145 else: 145 else:
146 textmode = mode 146 textmode = mode
147 #logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization)) 147 #logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))
148 textParam = "document=%s&mode=%s&pn=%s"%(docpath,textmode,pn) 148 textParam = "document=%s&mode=%s&pn=%s&characterNormalization=%s"%(docpath,textmode,pn,characterNormalization)
149 if highlightQuery is not None: 149 if highlightQuery is not None:
150 textParam +="&highlightQuery=%s&sn=%s"%(highlightQuery,sn) 150 textParam +="&highlightQuery=%s&sn=%s"%(highlightQuery,sn)
151 151
152 pagexml = self.getServerData("page-fragment.xql",textParam) 152 pagexml = self.getServerData("page-fragment.xql",textParam)
153 #pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", textParam, outputUnicode=False) 153 #pagexml=self.template.fulltextclient.eval("/mpdl/interface/page-fragment.xql", textParam, outputUnicode=False)
300 pagesize = pageinfo['tocPageSize'] 300 pagesize = pageinfo['tocPageSize']
301 pn = pageinfo['tocPN'] 301 pn = pageinfo['tocPN']
302 url = docinfo['url'] 302 url = docinfo['url']
303 selfurl = self.absolute_url() 303 selfurl = self.absolute_url()
304 viewMode= pageinfo['viewMode'] 304 viewMode= pageinfo['viewMode']
305 characterNormalization =pageinfo ['characterNormalization'] 305 characterNormalization = pageinfo ['characterNormalization']
306 tocMode = pageinfo['tocMode'] 306 tocMode = pageinfo['tocMode']
307 tocPN = pageinfo['tocPN'] 307 tocPN = pageinfo['tocPN']
308 308
309 data = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s&characterNormalization=%s"%(docpath,queryType, pagesize, pn,characterNormalization)) 309 data = self.getServerData("doc-query.xql","document=%s&queryType=%s&queryResultPageSize=%s&queryResultPN=%s&characterNormalization=%s"%(docpath,queryType, pagesize, pn,characterNormalization))
310 page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s'%(selfurl,url, viewMode, tocMode, tocPN)) 310 page = data.replace('page-fragment.xql?document=%s'%str(path),'%s?url=%s&viewMode=%s&tocMode=%s&tocPN=%s'%(selfurl,url, viewMode, tocMode, tocPN))