Mercurial > hg > documentViewer
changeset 392:9b2adae6c6e2
*** empty log message ***
| author | abukhman |
|---|---|
| date | Tue, 02 Nov 2010 16:51:41 +0100 |
| parents | 0eb7f0fad511 |
| children | bb317af1c197 |
| files | MpdlXmlTextServer.py documentViewer.py |
| diffstat | 2 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/MpdlXmlTextServer.py Tue Nov 02 16:32:44 2010 +0100 +++ b/MpdlXmlTextServer.py Tue Nov 02 16:51:41 2010 +0100 @@ -38,7 +38,7 @@ url = self.serverUrl+method return documentViewer.getHttpData(url,data,timeout=self.timeout) - def getSearch(self, pn=1, pageinfo=None, docinfo=None, query=None, queryType=None, lemma=None, characterNormalization=None): + def getSearch(self, pn=1, pageinfo=None, docinfo=None, query=None, queryType=None, lemma=None, characterNormalization=None, optionsClose=None): """get search list""" docpath = docinfo['textURLPath'] url = docinfo['url'] @@ -213,7 +213,7 @@ return originalPage - def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="", highlightQuery=None, sn=None): + def getTextPage(self, mode="text", pn=1, docinfo=None, pageinfo=None, viewMode=None, tocMode=None, tocPN=None, characterNormalization="", highlightQuery=None, sn=None, optionsClose=None): """returns single page from fulltext""" docpath = docinfo['textURLPath'] path = docinfo['textURLPath'] @@ -333,7 +333,7 @@ #pagexml=self.template.fulltextclient.eval("/mpdl/interface/lt/lemma.xql","document=&language="+str(language)+"&lemma="+url_quote(str(query))) return data - def getQuery (self, docinfo=None, pageinfo=None, query=None, queryType=None, pn=1): + def getQuery (self, docinfo=None, pageinfo=None, query=None, queryType=None, pn=1, optionsClose=None): """number of""" docpath = docinfo['textURLPath'] pagesize = pageinfo['queryPageSize']
--- a/documentViewer.py Tue Nov 02 16:32:44 2010 +0100 +++ b/documentViewer.py Tue Nov 02 16:51:41 2010 +0100 @@ -278,7 +278,7 @@ 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 @@ -799,10 +799,9 @@ 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['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')