--- documentViewer/MpdlXmlTextServer.py 2010/10/28 15:44:19 1.201 +++ documentViewer/MpdlXmlTextServer.py 2010/11/02 15:51:41 1.203 @@ -38,7 +38,7 @@ class MpdlXmlTextServer(SimpleItem): 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'] @@ -135,6 +135,7 @@ class MpdlXmlTextServer(SimpleItem): text=self.getServerData("xpath.xql", "document=%s&xpath=%s"%(docinfo['textURLPath'], xpath)) dom = Parse(text) result= dom.xpath("//result/resultPage") + docinfo['numPages']=int(getTextFromNode(result[0])) return docinfo @@ -191,19 +192,8 @@ class MpdlXmlTextServer(SimpleItem): #logging.debug("text :%s"%(text)) #dom =Parse(text) #logging.debug("text :%s"%(text)) - #return text - - def getBrowserType(self): - """get browser type object""" - if self.REQUEST.SESSION.has_key('browserType'): - return self.REQUEST.SESSION['browserType'] - else: - bt = browserCheck(self) - self.REQUEST.SESSION.set('browserType', bt) - logging.debug("documentViewer (BROWSER TYPE) bt %s"%bt) - return bt - - + #return text + def getOrigPages (self, docinfo=None, pageinfo=None): """Show original page """ docpath = docinfo['textURLPath'] @@ -223,7 +213,7 @@ class MpdlXmlTextServer(SimpleItem): 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'] @@ -343,7 +333,7 @@ class MpdlXmlTextServer(SimpleItem): #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']