--- documentViewer/documentViewer.py 2010/08/20 13:21:56 1.84 +++ documentViewer/documentViewer.py 2010/08/24 12:43:24 1.95 @@ -678,7 +678,7 @@ class documentViewer(Folder): self.REQUEST.SESSION['docinfo'] = docinfo return docinfo - def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None, characterNormalization=None): + def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None): """returns pageinfo with the given parameters""" pageinfo = {} current = getInt(current) @@ -701,7 +701,7 @@ class documentViewer(Folder): pageinfo['numgroups'] += 1 pageinfo['viewMode'] = viewMode pageinfo['tocMode'] = tocMode - pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization', '') + pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization',' ') pageinfo['query'] = self.REQUEST.get('query',' ') pageinfo['queryType'] = self.REQUEST.get('queryType',' ') pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext') @@ -713,8 +713,6 @@ class documentViewer(Folder): toc = int (pageinfo['tocPN']) pageinfo['textPages'] =int (toc) - logging.debug("documentViewer (getdocinfo) tocMode: %s"%tocMode) - if 'tocSize_%s'%tocMode in docinfo: tocSize = int(docinfo['tocSize_%s'%tocMode]) tocPageSize = int(pageinfo['tocPageSize'])