--- documentViewer/documentViewer.py 2010/08/24 12:11:26 1.93 +++ documentViewer/documentViewer.py 2010/08/24 13:27:07 1.97 @@ -226,7 +226,7 @@ class documentViewer(Folder): return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode) security.declareProtected('View','index_html') - def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None): + def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None, characterNormalization=""): ''' view it @param mode: defines how to access the document behind url @@ -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): + def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization=""): """returns pageinfo with the given parameters""" pageinfo = {} current = getInt(current) @@ -701,7 +701,8 @@ class documentViewer(Folder): pageinfo['numgroups'] += 1 pageinfo['viewMode'] = viewMode pageinfo['tocMode'] = tocMode - pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','') + pageinfo['characterNormalization'] =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')