Changeset 511:551ca1641a5e in documentViewer for documentViewer.py
- Timestamp:
- Feb 28, 2012, 5:21:59 PM (12 years ago)
- Branch:
- elementtree
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
documentViewer.py
r509 r511 124 124 toc_none = PageTemplateFile('zpt/toc_none', globals()) 125 125 common_template = PageTemplateFile('zpt/common_template', globals()) 126 search_template = PageTemplateFile('zpt/search_template', globals()) 126 127 info_xml = PageTemplateFile('zpt/info_xml', globals()) 127 128 docuviewer_css = ImageFile('css/docuviewer.css',globals()) … … 711 712 # int(current / grpsize) * grpsize +1)) 712 713 pageinfo['start'] = start 713 714 # get number of pages 714 715 np = int(docinfo.get('numPages', 0)) 715 716 if np == 0: … … 720 721 np = int(docinfo.get('numPages', 0)) 721 722 723 # cache table of contents 724 pageinfo['tocPageSize'] = getInt(self.REQUEST.get('tocPageSize', 30)) 722 725 pageinfo['numgroups'] = int(np / grpsize) 723 726 if np % grpsize > 0: … … 731 734 pageinfo['pageBatch'] = self.getPageBatch(start=start, rows=rows, cols=cols, pageFlowLtr=pageFlowLtr, pageZero=pageZero, minIdx=1, maxIdx=np) 732 735 733 # TODO: do we need this here?734 736 pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','reg') 735 pageinfo['tocPageSize'] = getInt(self.REQUEST.get('tocPageSize', 30)) 737 738 # cache search results 736 739 pageinfo['resultPageSize'] = getInt(self.REQUEST.get('resultPageSize', 10)) 737 pageinfo['tocPN'] = getInt(self.REQUEST.get('tocPN', '1'))738 pageinfo[' resultPN'] = getInt(self.REQUEST.get('resultPN','1'))739 740 # limit tocPN TODO: do we need this?741 if 'tocSize_%s'%tocMode in docinfo:742 tocSize = docinfo['tocSize_%s'%tocMode]743 tocPageSize = pageinfo['tocPageSize']744 # cached toc745 if tocSize%tocPageSize>0:746 tocPages=tocSize/tocPageSize+1747 else:748 tocPages=tocSize/tocPageSize749 750 pageinfo['tocPN'] = min(tocPages,pageinfo['tocPN'])740 query = self.REQUEST.get('query',None) 741 pageinfo['query'] = query 742 if query: 743 queryType = self.REQUEST.get('queryType', 'fulltextMorph') 744 pageinfo['queryType'] = queryType 745 pageinfo['resultStart'] = getInt(self.REQUEST.get('resultStart', '1')) 746 self.getSearchResults(mode=queryType, query=query, pageinfo=pageinfo, docinfo=docinfo) 747 748 # highlighting 749 highlightQuery = self.REQUEST.get('highlightQuery', None) 750 if highlightQuery: 751 pageinfo['highlightQuery'] = highlightQuery 752 pageinfo['highlightElement'] = self.REQUEST.get('highlightElement', '') 753 pageinfo['highlightElementPos'] = self.REQUEST.get('highlightElementPos', '') 751 754 752 755 return pageinfo
Note: See TracChangeset
for help on using the changeset viewer.