--- documentViewer/documentViewer.py 2010/10/11 13:40:37 1.118 +++ documentViewer/documentViewer.py 2010/10/15 14:26:20 1.124 @@ -5,7 +5,7 @@ from Products.PageTemplates.PageTemplate from AccessControl import ClassSecurityInfo from AccessControl import getSecurityManager from Globals import package_home -from Products.zogiLib import browserCheck +from Products.zogiLib.zogiLib import browserCheck from Ft.Xml import EMPTY_NAMESPACE, Parse import Ft.Xml.Domlette @@ -185,7 +185,19 @@ class documentViewer(Folder): def getSearch(self, **args): """get search""" return self.template.fulltextclient.getSearch(**args) - + + def getGisPlaces(self, **args): + """get gis places""" + return self.template.fulltextclient.getGisPlaces(**args) + + def getAllGisPlaces(self, **args): + """get all gis places """ + return self.template.fulltextclient.getAllGisPlaces(**args) + + def getOrigPages(self, **args): + """get original page number """ + return self.template.fulltextclient.getOrigPages(**args) + def getNumPages(self, docinfo): """get numpages""" return self.template.fulltextclient.getNumPages(docinfo) @@ -743,6 +755,7 @@ class documentViewer(Folder): """returns pageinfo with the given parameters""" pageinfo = {} current = getInt(current) + #pageinfo ['originalPage'] = originalPage pageinfo['current'] = current rows = int(rows or self.thumbrows) pageinfo['rows'] = rows @@ -775,6 +788,8 @@ class documentViewer(Folder): toc = int (pageinfo['tocPN']) pageinfo['textPages'] =int (toc) + + if 'tocSize_%s'%tocMode in docinfo: tocSize = int(docinfo['tocSize_%s'%tocMode]) tocPageSize = int(pageinfo['tocPageSize'])