--- zogiLib/zogiLib.py 2004/06/04 15:11:08 1.24 +++ zogiLib/zogiLib.py 2004/06/21 16:19:56 1.27 @@ -15,12 +15,6 @@ import urllib import types from Globals import package_home -def getString(self,key,default=''): - try: - return self.REQUEST[key] - except: - return default - def sendFile(self, filename, type): """sends an object or a local file (in the product) as response""" paths = filename.split('/') @@ -42,22 +36,24 @@ def sendFile(self, filename, type): self.REQUEST.RESPONSE.write(file(fn).read()) return -class BrowserCheck: +def browserCheck(self): """check the browsers request to find out the browser type""" - - def __init__(self, zope): - self.ua = zope.REQUEST.get_header("HTTP_USER_AGENT") - self.isIE = string.find(self.ua, 'MSIE') > -1 - self.isN4 = (string.find(self.ua, 'Mozilla/4.') > -1) and not self.isIE - self.nav = self.ua[string.find(self.ua, '('):] - ie = string.split(self.nav, "; ")[1] - if string.find(ie, "MSIE") > -1: - self.versIE = string.split(ie, " ")[1] - self.isMac = string.find(self.ua, 'Macintosh') > -1 - self.isWin = string.find(self.ua, 'Windows') > -1 - self.isIEWin = self.isIE and self.isWin - self.isIEMac = self.isIE and self.isMac + bt = {} + ua = self.REQUEST.get_header("HTTP_USER_AGENT") + bt['ua'] = ua + bt['isIE'] = string.find(ua, 'MSIE') > -1 + bt['isN4'] = (string.find(ua, 'Mozilla/4.') > -1) and not bt['isIE'] + nav = ua[string.find(ua, '('):] + ie = string.split(nav, "; ")[1] + if string.find(ie, "MSIE") > -1: + bt['versIE'] = string.split(ie, " ")[1] + bt['isMac'] = string.find(ua, 'Macintosh') > -1 + bt['isWin'] = string.find(ua, 'Windows') > -1 + bt['isIEWin'] = bt['isIE'] and bt['isWin'] + bt['isIEMac'] = bt['isIE'] and bt['isMac'] + bt['staticHTML'] = False + return bt def manage_addZogiLibMainTemplateForm(self): """Form for adding""" @@ -428,7 +424,7 @@ class zogiLib(Folder): {'label':'Main Config','action':'changeZogiLibForm'}, ) - def __init__(self, id, title, digilibBaseUrl, localFileBase, version="book", basePath=""): + def __init__(self, id, title, digilibBaseUrl, localFileBase, version="book", basePath="", dlTarget=None): """init""" self.id=id @@ -437,7 +433,10 @@ class zogiLib(Folder): self.localFileBase=localFileBase self.basePath=basePath self.layout=version - + if dlTarget: + self.dlTarget = dlTarget + else: + self.dlTarget = "digilib" def getDLInfo(self): """get DLInfo from digilib server""" @@ -456,22 +455,32 @@ class zogiLib(Folder): def createHeadJS(self): """generate all javascript tags for head""" + self.checkQuery() + bt = self.REQUEST.SESSION['browserType'] + if bt['staticHTML']: + return + pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/zogilib_head_js')).__of__(self) return pt() def createParamJS(self): """generate javascript for parameters only""" + self.checkQuery() + bt = self.REQUEST.SESSION['browserType'] + if bt['staticHTML']: + return + pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/zogilib_param_js')).__of__(self) return pt() - def createScalerImg(self, requestString = None, bottom = 0, side = 0): + def createScalerImg(self, requestString=None, bottom=0, side=0, width=500, height=500): """generate Scaler IMG Tag""" self.checkQuery() bt = self.REQUEST.SESSION['browserType'] # override with parameters from session if self.REQUEST.SESSION.has_key('scalerDiv'): - (requestString, bottom, side) = self.REQUEST.SESSION['scalerDiv'] + (requestString, bottom, side, width, height) = self.REQUEST.SESSION['scalerDiv'] # if not explicitly defined take normal request if not requestString: requestString = self.getAllDLParams() @@ -483,30 +492,35 @@ class zogiLib(Folder): b_par = "-" + str(int(bottom)) s_par = "-" + str(int(side)) tag = "" - if bt.isN4: - # N4 needs layers - tag += '' - else: - tag += '
' - tag += '' - if bt.isN4: - tag += '' + if bt['staticHTML']: + tag += '
'%(url, int(width-side), int(height-bottom)) else: - tag += '
' + if bt['isN4']: + # N4 needs layers + tag += '' + else: + tag += '
' + tag += '' + if bt['isN4']: + tag += '' + else: + tag += '
' return tag - def createScalerDiv(self, requestString = None, bottom = 0, side = 0): + def createScalerDiv(self, requestString = None, bottom = 0, side = 0, width=500, height=500): """generate scaler img and table with navigation arrows""" self.checkQuery() if requestString != None or bottom != 0 or side != 0: - self.REQUEST.SESSION['scalerDiv'] = (requestString, bottom, side) + self.REQUEST.SESSION['scalerDiv'] = (requestString, bottom, side, width, height) else: if self.REQUEST.SESSION.has_key('scalerDiv'): + # make shure to remove unused parameter del self.REQUEST.SESSION['scalerDiv'] + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt/zogilib_img_div')).__of__(self) return pt() @@ -514,7 +528,9 @@ class zogiLib(Folder): """generate other divs""" self.checkQuery() bt = self.REQUEST.SESSION['browserType'] - if bt.isN4: + if bt['staticHTML']: + return + if bt['isN4']: f = 'zpt/zogilib_divsN4.zpt' else: f = 'zpt/zogilib_divs.zpt' @@ -537,7 +553,12 @@ class zogiLib(Folder): def optionwindow(self): """showoptions""" - pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/optionwindow.zpt')).__of__(self) + self.checkQuery() + bt = self.REQUEST.SESSION['browserType'] + if bt['staticHTML']: + pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/optionwindow_static.zpt')).__of__(self) + else: + pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/optionwindow.zpt')).__of__(self) return pt() def mark1(self): @@ -608,11 +629,18 @@ class zogiLib(Folder): def index_html(self): """main action""" + self.checkQuery() + bt = self.REQUEST.SESSION['browserType'] tp = "zogiLibMainTemplate" if hasattr(self, tp): pt = getattr(self, tp) else: - pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/zogiLibMain_%s'%self.layout)).__of__(self) + tpt = self.layout + if bt['staticHTML']: + tpt = "static" + + pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/zogiLibMain_%s'%tpt)).__of__(self) + return pt() @@ -629,7 +657,8 @@ class zogiLib(Folder): pv = fm.split('=') dlParams[pv[0]] = pv[1] except: - print "ouch!" + pass + # parse digilib mode parameter if 'mo' in dlParams: if len(dlParams['mo']) > 0: @@ -640,13 +669,16 @@ class zogiLib(Folder): self.REQUEST.SESSION['query'] = dlParams self.REQUEST.SESSION['dlModes'] = modes self.REQUEST.SESSION['dlInfo'] = self.getDLInfo() - self.REQUEST.SESSION['browserType'] = BrowserCheck(self) + if not self.REQUEST.SESSION.has_key('browserType'): + self.REQUEST.SESSION['browserType'] = browserCheck(self) + + return def checkQuery(self): """check if the query has been stored""" - if not (self.REQUEST.SESSION): + if not (self.REQUEST.SESSION and self.REQUEST.SESSION.has_key('query')) : print "ZOGILIB: have to store query!!" - self.storeQuery + self.storeQuery() return def zogilibPath(self, otherbase=None): @@ -716,6 +748,18 @@ class zogiLib(Folder): else: self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'?'+params) + + def setStaticHTML(self, static=True): + """sets the preference to static HTML""" + self.checkQuery() + self.REQUEST.SESSION['browserType']['staticHTML'] = static + return + + def isStaticHTML(self): + """returns if the page is using static HTML only""" + self.checkQuery() + return self.REQUEST.SESSION['browserType']['staticHTML'] + def getPT(self): """pagenums""" di = self.REQUEST.SESSION['dlInfo'] @@ -727,25 +771,25 @@ class zogiLib(Folder): def getPN(self): """Pagenum""" pn = self.getDLParam('pn') - if pn: + try: return int(pn) - else: + except: return 1 def getBiggerWS(self): """ws+1""" ws = self.getDLParam('ws') - if ws: - return int(ws)+1 - else: - return 2 + try: + return float(ws)+0.5 + except: + return 1.5 def getSmallerWS(self): """ws-1""" ws=self.getDLParam('ws') - if ws: - return max(int(ws)-1, 1) - else: + try: + return max(float(ws)-0.5, 1) + except: return 1 def hasMode(self, mode): @@ -785,6 +829,18 @@ class zogiLib(Folder): wh = float(self.getDLParam('wh') or 1) return (wy + wh < 1) + + def dl_StaticHTML(self): + """set rendering to static HTML""" + self.checkQuery() + self.REQUEST.SESSION['browserType']['staticHTML'] = True + return self.display() + + def dl_DynamicHTML(self): + """set rendering to dynamic HTML""" + self.checkQuery() + self.REQUEST.SESSION['browserType']['staticHTML'] = False + return self.display() def dl_HMirror(self): """mirror action""" @@ -926,13 +982,17 @@ class zogiLib(Folder): pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/changeZogiLibForm.zpt')).__of__(self) return pt() - def changeZogiLib(self,title,digilibBaseUrl, localFileBase, version, basePath, RESPONSE=None): + def changeZogiLib(self,title,digilibBaseUrl, localFileBase, version, basePath, dlTarget, RESPONSE=None): """change it""" self.title=title self.digilibBaseUrl=digilibBaseUrl self.localFileBase=localFileBase self.basePath = basePath self.layout=version + if dlTarget: + self.dlTarget = dlTarget + else: + self.dlTarget = "digilib" if RESPONSE is not None: RESPONSE.redirect('manage_main') @@ -943,9 +1003,9 @@ def manage_addZogiLibForm(self): pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/addZogiLibForm')).__of__(self) return pt() -def manage_addZogiLib(self,id,title,digilibBaseUrl, localFileBase,version="book",basePath="",RESPONSE=None): +def manage_addZogiLib(self,id,title,digilibBaseUrl, localFileBase,version="book",basePath="",dlTarget="digilib",RESPONSE=None): """add dgilib""" - newObj=zogiLib(id,title,digilibBaseUrl, localFileBase, version, basePath) + newObj=zogiLib(id,title,digilibBaseUrl, localFileBase, version, basePath, dlTarget) self.Destination()._setObject(id,newObj) if RESPONSE is not None: RESPONSE.redirect('manage_main')