--- documentViewer/documentViewer.py 2010/10/29 12:53:45 1.148 +++ documentViewer/documentViewer.py 2010/11/02 15:51:41 1.152 @@ -18,7 +18,7 @@ import math import urlparse import cStringIO import re - +import string def logger(txt,method,txt2): """logging""" @@ -278,7 +278,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="", optionsClose=None): ''' view it @param mode: defines how to access the document behind url @@ -325,12 +325,14 @@ class documentViewer(Folder): for m in mk: ret+="mk=%s"%m return ret - + + def getBrowser(self): """getBrowser the version of browser """ - bt = browserCheck(self) - logging.debug("XXXXXXXXXXXXXXXX: %s"%bt) - return bt + names="" + names = browserCheck(self) + #logging.debug("XXXXXXXXXXXXXXXX: %s"%names) + return names def findDigilibUrl(self): """try to get the digilib URL from zogilib""" @@ -797,9 +799,9 @@ class documentViewer(Folder): pageinfo['numgroups'] += 1 pageinfo['viewMode'] = viewMode pageinfo['tocMode'] = tocMode - #pageinfo ['originalPage'] = self.getOrigPages(docinfo=None, pageinfo=None) pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','') pageinfo['query'] = self.REQUEST.get('query','') + pageinfo['optionsClose']= self.REQUEST.get('optionsClose','') pageinfo['queryType'] = self.REQUEST.get('queryType','') pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext') pageinfo['textPN'] = self.REQUEST.get('textPN','1')