comparison MpdlXmlTextServer.py @ 399:8abb09665ae5

*** empty log message ***
author abukhman
date Tue, 09 Nov 2010 12:42:33 +0100
parents 55f9eeebc338
children b2b687b0d39a
comparison
equal deleted inserted replaced
398:55f9eeebc338 399:8abb09665ae5
49 query =pageinfo['query'] 49 query =pageinfo['query']
50 queryType =pageinfo['queryType'] 50 queryType =pageinfo['queryType']
51 viewMode= pageinfo['viewMode'] 51 viewMode= pageinfo['viewMode']
52 tocMode = pageinfo['tocMode'] 52 tocMode = pageinfo['tocMode']
53 characterNormalization = pageinfo['characterNormalization'] 53 characterNormalization = pageinfo['characterNormalization']
54 optionToggle = pageinfo['optionToggle']
54 tocPN = pageinfo['tocPN'] 55 tocPN = pageinfo['tocPN']
55 selfurl = self.absolute_url() 56 selfurl = self.absolute_url()
56 57
57 data = self.getServerData("doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s&viewMode=%s&characterNormalization=%s&highlightQuery=%s"%(docpath, 'text', queryType, urllib.quote(query), pagesize, pn, sn, viewMode,characterNormalization ,urllib.quote(highlightQuery))) 58 data = self.getServerData("doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&sn=%s&viewMode=%s&characterNormalization=%s&optionToggle=%s&highlightQuery=%s"%(docpath, 'text', queryType, urllib.quote(query), pagesize, pn, sn, viewMode,characterNormalization,optionToggle ,urllib.quote(highlightQuery)))
58 #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&highlightQuery=%s"%(docpath, 'text', queryType, query, pagesize, pn, sn, viewMode,highlightQuery) ,outputUnicode=False) 59 #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&highlightQuery=%s"%(docpath, 'text', queryType, query, pagesize, pn, sn, viewMode,highlightQuery) ,outputUnicode=False)
59 60
60 pagexml = data.replace('?document=%s'%str(docpath),'?url=%s'%url) 61 pagexml = data.replace('?document=%s'%str(docpath),'?url=%s'%url)
61 pagedom = Parse(pagexml) 62 pagedom = Parse(pagexml)
62 if (queryType=="fulltext")or(queryType=="xpath")or(queryType=="xquery")or(queryType=="fulltextMorphLemma"): 63 if (queryType=="fulltext")or(queryType=="xpath")or(queryType=="xquery")or(queryType=="fulltextMorphLemma"):