--- documentViewer/documentViewer.py 2011/03/01 14:53:15 1.170 +++ documentViewer/documentViewer.py 2011/05/17 13:02:57 1.174 @@ -46,10 +46,10 @@ def getTextFromNode(nodename): def serializeNode(node, encoding="utf-8"): """returns a string containing node as XML""" stream = cStringIO.StringIO() - logging.debug("BUF: %s"%(stream)) - Ft.Xml.Domlette.PrettyPrint(node, stream=stream, encoding=encoding) + #logging.debug("BUF: %s"%(stream)) + Ft.Xml.Domlette.Print(node, stream=stream, encoding=encoding) s = stream.getvalue() - logging.debug("BUF: %s"%(s)) + #logging.debug("BUF: %s"%(s)) stream.close() return s @@ -230,7 +230,15 @@ class documentViewer(Folder): def getTextPage(self, **args): """get page""" return self.template.fulltextclient.getTextPage(**args) + + def getOrigPages(self, **args): + """get page""" + return self.template.fulltextclient.getOrigPages(**args) + def getOrigPagesNorm(self, **args): + """get page""" + return self.template.fulltextclient.getOrigPagesNorm(**args) + def getQuery(self, **args): """get query in search""" return self.template.fulltextclient.getQuery(**args) @@ -255,6 +263,14 @@ class documentViewer(Folder): """get lemma""" return self.template.fulltextclient.getLemma(**args) + def getLemmaQuery(self, **args): + """get query""" + return self.template.fulltextclient.getLemmaQuery(**args) + + def getLex(self, **args): + """get lex""" + return self.template.fulltextclient.getLex(**args) + def getToc(self, **args): """get toc""" return self.template.fulltextclient.getToc(**args) @@ -890,7 +906,7 @@ class documentViewer(Folder): pageinfo['viewMode'] = viewMode pageinfo['tocMode'] = tocMode pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','reg') - pageinfo['optionToggle'] = self.REQUEST.get('optionToggle','') + #pageinfo['optionToggle'] = self.REQUEST.get('optionToggle','1') pageinfo['query'] = self.REQUEST.get('query','') pageinfo['queryType'] = self.REQUEST.get('queryType','') pageinfo['querySearch'] =self.REQUEST.get('querySearch', 'fulltext')