Changeset 509:9d05befdd462 in documentViewer
- Timestamp:
- Feb 27, 2012, 8:57:18 PM (12 years ago)
- Branch:
- elementtree
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
MpdlXmlTextServer.py
r508 r509 271 271 272 272 273 def getSearchResults(self, mode, query=None, docinfo=None):273 def getSearchResults(self, mode, query=None, pageinfo=None, docinfo=None): 274 274 """loads list of search results and stores XML in docinfo""" 275 275 logging.debug("getSearchResults mode=%s query=%s"%(mode, query)) … … 282 282 283 283 docpath = docinfo['textURLPath'] 284 # we need to set a result set size 285 pagesize = 1000 286 pn = 1 284 287 285 # fetch full results 288 286 params = {'document': docpath, … … 291 289 'query': query, 292 290 'queryResultPageSize': 1000, 293 'queryResultPN': 1} 291 'queryResultPN': 1, 292 'characterNormalization': pageinfo.get('characterNormalization', 'reg')} 294 293 pagexml = self.getServerData("doc-query.xql",urllib.urlencode(params)) 295 294 #pagexml = self.getServerData("doc-query.xql","document=%s&mode=%s&queryType=%s&query=%s&queryResultPageSize=%s&queryResultPN=%s&s=%s&viewMode=%s&characterNormalization=%s&highlightElementPos=%s&highlightElement=%s&highlightQuery=%s"%(docpath, 'text', queryType, urllib.quote(query), pagesize, pn, s, viewMode,characterNormalization, highlightElementPos, highlightElement, urllib.quote(highlightQuery))) … … 322 321 #TODO: cache only one search 323 322 if not docinfo.has_key('resultXML_%s_%s'%(mode,query)): 324 self.getSearchResults(mode=mode, query=query, docinfo=docinfo)323 self.getSearchResults(mode=mode, query=query, pageinfo=pageinfo, docinfo=docinfo) 325 324 326 325 resultxml = docinfo.get('resultXML_%s_%s'%(mode,query), None) -
documentViewer.py
r508 r509 733 733 # TODO: do we need this here? 734 734 pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','reg') 735 pageinfo['query'] = self.REQUEST.get('query','')736 pageinfo['queryType'] = self.REQUEST.get('queryType','')737 pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')738 pageinfo['highlightQuery'] = self.REQUEST.get('highlightQuery','')739 735 pageinfo['tocPageSize'] = getInt(self.REQUEST.get('tocPageSize', 30)) 740 pageinfo[' queryPageSize'] = getInt(self.REQUEST.get('queryPageSize', 10))736 pageinfo['resultPageSize'] = getInt(self.REQUEST.get('resultPageSize', 10)) 741 737 pageinfo['tocPN'] = getInt(self.REQUEST.get('tocPN', '1')) 742 pageinfo[' searchPN'] = getInt(self.REQUEST.get('searchPN','1'))743 744 # limit tocPN 738 pageinfo['resultPN'] = getInt(self.REQUEST.get('resultPN','1')) 739 740 # limit tocPN TODO: do we need this? 745 741 if 'tocSize_%s'%tocMode in docinfo: 746 742 tocSize = docinfo['tocSize_%s'%tocMode] -
zpt/viewer_text.zpt
r508 r509 69 69 <h4>Text display</h4> 70 70 <pre tal:content="python:repr(viewLayers)" /> 71 <pre tal:content="python:repr(viewLayer)" /> 71 72 <form tal:attributes="action viewerUrl" class="autosubmit"> 72 73 <input type="hidden" … … 182 183 tal:define="norm python:pageinfo.get('characterNormalization','regPlusNorm');"> 183 184 <input type="hidden" 184 tal:define="params python:here.getParams( 'characterNormalization',None)"185 tal:define="params python:here.getParams(params={'characterNormalization':None, 'viewLayer':viewLayer})" 185 186 tal:repeat="param params" 186 187 tal:attributes="name param; value python:params[param]" />
Note: See TracChangeset
for help on using the changeset viewer.