--- documentViewer/documentViewer.py 2010/12/06 10:39:43 1.160 +++ documentViewer/documentViewer.py 2010/12/20 13:52:07 1.161 @@ -147,6 +147,7 @@ class documentViewer(Folder): toc_text = PageTemplateFile('zpt/toc_text', globals()) toc_figures = PageTemplateFile('zpt/toc_figures', globals()) page_main_images = PageTemplateFile('zpt/page_main_images', globals()) + page_main_double = PageTemplateFile('zpt/page_main_double', globals()) page_main_text = PageTemplateFile('zpt/page_main_text', globals()) page_main_text_dict = PageTemplateFile('zpt/page_main_text_dict', globals()) page_main_gis =PageTemplateFile ('zpt/page_main_gis', globals()) @@ -212,10 +213,6 @@ class documentViewer(Folder): """get query""" return self.template.fulltextclient.getQueryResultHitsFigures(**args) - def getPDF(self, **args): - """get query""" - return self.template.fulltextclient.getPDF(**args) - def getSearch(self, **args): """get search""" return self.template.fulltextclient.getSearch(**args) @@ -236,6 +233,14 @@ class documentViewer(Folder): """get original page number """ return self.template.fulltextclient.getAllPlaces(**args) + def getTocEntries(self, **args): + """get original page number """ + return self.template.fulltextclient.getTocEntries(**args) + + def getFigureEntries(self, **args): + """get original page number """ + return self.template.fulltextclient.getFigureEntries(**args) + def getNumPages(self, docinfo): """get numpages""" return self.template.fulltextclient.getNumPages(docinfo) @@ -348,7 +353,6 @@ class documentViewer(Folder): """getBrowser the version of browser """ names="" names = browserCheck(self) - #logging.debug("XXXXXXXXXXXXXXXX: %s"%names) return names def findDigilibUrl(self): @@ -834,7 +838,7 @@ class documentViewer(Folder): pageinfo['numgroups'] += 1 pageinfo['viewMode'] = viewMode pageinfo['tocMode'] = tocMode - pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','regPlusNorm') + pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','reg') pageinfo['optionToggle'] = self.REQUEST.get('optionToggle','') pageinfo['query'] = self.REQUEST.get('query','') pageinfo['queryType'] = self.REQUEST.get('queryType','')