comparison MpdlXmlTextServer.py @ 167:7e2b97941a66

characterNormalization
author abukhman
date Tue, 24 Aug 2010 14:43:24 +0200
parents ffb5c62bd459
children 21ac9164eedf
comparison
equal deleted inserted replaced
166:ffb5c62bd459 167:7e2b97941a66
40 40
41 def getSearch(self, pn=1, pageinfo=None, docinfo=None, query=None, queryType=None, lemma=None): 41 def getSearch(self, pn=1, pageinfo=None, docinfo=None, query=None, queryType=None, lemma=None):
42 """get search list""" 42 """get search list"""
43 docpath = docinfo['textURLPath'] 43 docpath = docinfo['textURLPath']
44 url = docinfo['url'] 44 url = docinfo['url']
45 #logging.debug("documentViewer (gettoc) docpath: %s"%(docpath)) 45 logging.debug("documentViewer (gettoc) docpath: %s"%(docpath))
46 #logging.debug("documentViewer (gettoc) url: %s"%(url)) 46 logging.debug("documentViewer (gettoc) url: %s"%(url))
47 pagesize = pageinfo['queryPageSize'] 47 pagesize = pageinfo['queryPageSize']
48 pn = pageinfo['searchPN'] 48 pn = pageinfo['searchPN']
49 sn = pageinfo['sn'] 49 sn = pageinfo['sn']
50 highlightQuery = pageinfo['highlightQuery'] 50 highlightQuery = pageinfo['highlightQuery']
51 query =pageinfo['query'] 51 query =pageinfo['query']
251 #pagexml=self.template.fulltextclient.eval("/mpdl/interface/doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s"%(docpath, 'text', queryType, query, pagesize, pn) ,outputUnicode=False) 251 #pagexml=self.template.fulltextclient.eval("/mpdl/interface/doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s"%(docpath, 'text', queryType, query, pagesize, pn) ,outputUnicode=False)
252 pagedom = Parse(pagexml) 252 pagedom = Parse(pagexml)
253 numdivs = pagedom.xpath("//div[@class='queryResultHits']") 253 numdivs = pagedom.xpath("//div[@class='queryResultHits']")
254 tocSearch = int(getTextFromNode(numdivs[0])) 254 tocSearch = int(getTextFromNode(numdivs[0]))
255 tc=int((tocSearch/10)+1) 255 tc=int((tocSearch/10)+1)
256 #logging.debug("documentViewer (gettoc) tc: %s"%(tc)) 256 logging.debug("documentViewer (gettoc) tc: %s"%(tc))
257 return tc 257 return tc
258 258
259 def getToc(self, mode="text", docinfo=None): 259 def getToc(self, mode="text", docinfo=None):
260 """loads table of contents and stores in docinfo""" 260 """loads table of contents and stores in docinfo"""
261 #logging.debug("documentViewer (gettoc) mode: %s"%(mode)) 261 logging.debug("documentViewer (gettoc) mode: %s"%(mode))
262 if mode == "none": 262 if mode == "none":
263 return docinfo 263 return docinfo
264 if 'tocSize_%s'%mode in docinfo: 264 if 'tocSize_%s'%mode in docinfo:
265 # cached toc 265 # cached toc
266 return docinfo 266 return docinfo
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"%(docpath,queryType, pagesize, pn)) 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&characterNormalization=%s'%(selfurl,url, viewMode, tocMode, tocPN,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))
311 text = page.replace('mode=image','mode=texttool') 311 text = page.replace('mode=image','mode=texttool')
312 logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization)) 312 logging.debug("documentViewer (characterNormalization) characterNormalization: %s"%(characterNormalization))
313 #logging.debug("documentViewer (characterNormalization) text: %s"%(text)) 313 #logging.debug("documentViewer (characterNormalization) text: %s"%(text))
314 return text 314 return text
315 315