--- documentViewer/documentViewer.py 2010/10/08 13:20:30 1.106 +++ documentViewer/documentViewer.py 2010/10/18 10:14:08 1.134 @@ -5,6 +5,7 @@ from Products.PageTemplates.PageTemplate from AccessControl import ClassSecurityInfo from AccessControl import getSecurityManager from Globals import package_home +from Products.zogiLib.zogiLib import browserCheck from Ft.Xml import EMPTY_NAMESPACE, Parse import Ft.Xml.Domlette @@ -18,6 +19,7 @@ import urlparse import cStringIO import re + def logger(txt,method,txt2): """logging""" logging.info(txt+ txt2) @@ -49,7 +51,17 @@ def serializeNode(node, encoding='utf-8' buf.close() return s - +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 + + def getParentDir(path): """returns pathname shortened by one""" return '/'.join(path.split('/')[0:-1]) @@ -173,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) @@ -219,7 +243,9 @@ class documentViewer(Folder): self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary" docinfo = self.getDocinfo(mode=mode,url=url) - pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo) + #pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo) + pageinfo = self.getPageinfo(start=start,current=pn, originalPage=originalPage, docinfo=docinfo) + ''' ZDES ''' pt = getattr(self.template, 'thumbs_main_rss') if viewMode=="auto": # automodus gewaehlt @@ -231,7 +257,7 @@ class documentViewer(Folder): 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="",originalPage=None): ''' view it @param mode: defines how to access the document behind url @@ -264,7 +290,7 @@ class documentViewer(Folder): else: viewMode="images" - pageinfo = self.getPageinfo(start=start,current=pn,docinfo=docinfo,viewMode=viewMode,tocMode=tocMode) + pageinfo = self.getPageinfo(start=start,current=pn, docinfo=docinfo,viewMode=viewMode,tocMode=tocMode, originalPage=originalPage) pt = getattr(self.template, 'viewer_main') return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=self.generateMarks(mk)) @@ -401,9 +427,11 @@ class documentViewer(Folder): regpath = regexp.match(url) if (regpath==None): return "" - + logging.debug("(getDomFromIndexMeta): URLXAXA: %s"%regpath.group(2)) return ("/mpiwg/online/"+regpath.group(1)+"/"+regpath.group(2)) + + def getIndexMetaUrl(self,url): """returns utr of index.meta document at url""" @@ -542,19 +570,9 @@ class documentViewer(Folder): for x in range(cut): path=getParentDir(path) dom = self.getDomFromIndexMeta(path) - - docinfo['indexMetaPath']=self.getIndexMetaPath(path); - - #result= dom.xpath("//result/resultPage") - #docinfo['numPages']=int(getTextFromNode(result[0])) - - if len(name) > 0: - try: - result =dom.xpath("//name") - docinfo['name']=getTextFromNode(result[0]) - logging.debug("documentViewer docinfo[name] %s"%docinfo[name]) - except: pass - #logging.debug("documentViewer (getbibinfofromindexmeta) using mapping for %s"%bibtype) + + docinfo['name']=getTextFromNode(dom.xpath("/resource/name")[0]) + logging.debug("documentViewer docinfo[name] %s"%docinfo['name']) return docinfo def getDocinfoFromTextTool(self, url, dom=None, docinfo=None): @@ -644,6 +662,7 @@ class documentViewer(Folder): presentationUrls = dom.xpath("//texttool/presentation") docinfo = self.getBibinfoFromIndexMeta(url, docinfo=docinfo, dom=dom) # get info von bib tag docinfo = self.getNameFromIndexMeta(url, docinfo=docinfo, dom=dom) + #docinfo =self.getOrigPages(docinfo=docinfo) if presentationUrls and (len(presentationUrls) > 0): # ueberschreibe diese durch presentation informationen # presentation url ergiebt sich ersetzen von index.meta in der url der fuer die Metadaten @@ -724,13 +743,16 @@ class documentViewer(Folder): raise ValueError("Unknown mode %s! Has to be one of 'texttool','imagepath','filepath'."%(mode)) logging.debug("documentViewer (getdocinfo) docinfo: %s"%docinfo) + logging.debug("originalPage: %s"%originalPage) self.REQUEST.SESSION['docinfo'] = docinfo return docinfo - def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization=""): + def getPageinfo(self, current, start=None, rows=None, cols=None, docinfo=None, viewMode=None, tocMode=None,characterNormalization="", originalPage=None): """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 @@ -763,6 +785,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'])