--- documentViewer/documentViewer.py 2010/10/18 10:08:59 1.132 +++ documentViewer/documentViewer.py 2010/10/18 10:16:49 1.136 @@ -257,7 +257,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, characterNormalization=""): + def index_html(self,url,mode="texttool",viewMode="auto",tocMode="thumbs",start=None,pn=1,mk=None, query=None, querySearch=None, characterNormalization="",originalPage=None): ''' view it @param mode: defines how to access the document behind url @@ -268,7 +268,7 @@ class documentViewer(Folder): @param querySearch: type of different search modes (fulltext, fulltextMorph, xpath, xquery, ftIndex, ftIndexMorph, fulltextMorphLemma) ''' - logging.debug("documentViewer (index) mode: %s url:%s start:%s pn:%s"%(mode,url,start,pn)) + logging.debug("documentViewer (index) mode: %s url:%s start:%s pn:%s originalPage:%s"%(mode,url,start,pn,originalPage)) if not hasattr(self, 'template'): # this won't work @@ -743,6 +743,7 @@ class documentViewer(Folder): raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode)) logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo) + self.REQUEST.SESSION['docinfo'] = docinfo return docinfo @@ -784,7 +785,7 @@ class documentViewer(Folder): toc = int (pageinfo['tocPN']) pageinfo['textPages'] =int (toc) - + logging.debug("originalPage: %s"%originalPage) if 'tocSize_%s'%tocMode in docinfo: tocSize = int(docinfo['tocSize_%s'%tocMode])