'
- tag += ''
- if bt.isN4:
- tag += ''
+ tag = ""
+ if bt['staticHTML']:
+ tag += '
'%(url, int(width-side), int(height-bottom))
else:
- tag += '
'
+ if bt['isN4']:
+ # N4 needs layers
+ tag += ''
+ tag += ''
+ if bt['isN4']:
+ tag += ''
+ else:
+ tag += '
'
return tag
- def createScalerDiv(self):
+ 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, 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()
@@ -501,7 +610,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'
@@ -510,22 +621,31 @@ class zogiLib(Folder):
def option_js(self):
- """option_js"""
- pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/option_js')).__of__(self)
- return pt()
+ """javascript"""
+ return sendFile(self, 'js/option.js', 'text/plain')
def dl_lib_js(self):
"""javascript"""
- return sendFile(self, 'js/dl_lib.js', 'text/plain')
+ return sendFile(self, 'js/dllib.js', 'text/plain')
def js_lib_js(self):
"""javascript"""
- return sendFile(self, 'js/js_lib.js', 'text/plain')
+ return sendFile(self, 'js/baselib.js', 'text/plain')
def optionwindow(self):
"""showoptions"""
- pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/optionwindow.zpt')).__of__(self)
- return pt()
+ 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:
+ finds=self.ZopeFind(self,obj_ids=['viewingTools.zpt'])
+ if finds:
+
+ return finds[0][1]()
+ else:
+ pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/optionwindow.zpt')).__of__(self)
+ return pt()
def mark1(self):
"""mark image"""
@@ -595,11 +715,20 @@ 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()
@@ -616,7 +745,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:
@@ -627,18 +757,28 @@ 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!!"
- storeQuery(self)
+ self.storeQuery()
+ return
- def zogilibPath(self):
+ def zogilibPath(self, otherbase=None):
"""returns an URL to the zogiLib instance"""
url = self.REQUEST['URL1']
- url += self.basePath
+ # should end with "/"
+ if len(url) > 0 and url[-1] != '/':
+ url += '/'
+ if type(otherbase) is str:
+ url += otherbase
+ else:
+ url += self.basePath
# should end with "/"
if len(url) > 0 and url[-1] != '/':
url += '/'
@@ -649,7 +789,7 @@ class zogiLib(Folder):
try:
return self.REQUEST.SESSION['query'][param]
except:
- return None
+ return
def setDLParam(self, param, value):
"""sets parameter"""
@@ -665,9 +805,11 @@ class zogiLib(Folder):
# assemble query string
ret = ""
for param in dlParams.keys():
+ if dlParams[param] is None: continue
val = str(dlParams[param])
if val != "":
ret += param + "=" + val + "&"
+
# omit trailing "&"
return ret.rstrip('&')
@@ -696,6 +838,37 @@ class zogiLib(Folder):
else:
self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'?'+params)
+ def getMetaFileName(self):
+ url=self.dlServerURL+'/dlContext-xml.jsp?'+self.getAllDLParams()
+ return urlbase
+
+ def getToolbarPageURL(self):
+ """returns a toolbar-enabled page URL"""
+ url=self.dlServerURL+'/digimage.jsp?'+self.getAllDLParams()
+ return url
+
+ def getDLTarget(self):
+ """returns dlTarget"""
+ self.checkQuery()
+ s = self.dlTarget
+# s = 'dl'
+# if self.getDLParam('fn'):
+# s += "_" + self.getDLParam('fn')
+# if self.getDLParam('pn'):
+# s += "_" + self.getDLParam('pn')
+ return s
+
+ 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']
@@ -707,27 +880,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')
- print "ws: ", ws
- if ws:
- print "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):
@@ -767,6 +938,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"""
@@ -802,10 +985,10 @@ class zogiLib(Folder):
wh2 = max(min(wh2, 1), 0)
wx = max(min(wx, 1), 0)
wy = max(min(wy, 1), 0)
- self.setDLParam('ww', ww2)
- self.setDLParam('wh', wh2)
- self.setDLParam('wx', wx)
- self.setDLParam('wy', wy)
+ self.setDLParam('ww', cropf(ww2))
+ self.setDLParam('wh', cropf(wh2))
+ self.setDLParam('wx', cropf(wx))
+ self.setDLParam('wy', cropf(wy))
return self.display()
def dl_ZoomIn(self):
@@ -828,8 +1011,8 @@ class zogiLib(Folder):
wy += dy * 0.5 * wh
wx = max(min(wx, 1), 0)
wy = max(min(wy, 1), 0)
- self.setDLParam('wx', wx)
- self.setDLParam('wy', wy)
+ self.setDLParam('wx', cropf(wx))
+ self.setDLParam('wy', cropf(wy))
return self.display()
def dl_MoveLeft(self):
@@ -901,20 +1084,27 @@ class zogiLib(Folder):
self.setDLParam('mk', mk)
return self.display()
-
+ def dl_db(self,db):
+ """set db"""
+ self.setDLParam('db',db)
+ self.display()
def changeZogiLibForm(self):
"""Main configuration"""
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.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')
@@ -925,9 +1115,47 @@ 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')
+
+
+class zogiLibPageTemplate(ZopePageTemplate):
+ """pageTemplate Objekt"""
+ meta_type="zogiLib_pageTemplate"
+
+
+## def __init__(self, id, text=None, contentType=None):
+## self.id = str(id)
+## self.ZBindings_edit(self._default_bindings)
+## if text is None:
+## text = open(self._default_cont).read()
+## self.pt_edit(text, contentType)
+
+def manage_addZogiLibPageTemplateForm(self):
+ """Form for adding"""
+ pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/addZogiLibPageTemplateForm')).__of__(self)
+ return pt()
+
+def manage_addZogiLibPageTemplate(self, id='zogiLibMainTemplate', title=None, layout=None, text=None,
+ REQUEST=None, submit=None):
+ "Add a Page Template with optional file content."
+
+ id = str(id)
+ self._setObject(id, zogiLibPageTemplate(id))
+ ob = getattr(self, id)
+ if not layout: layout = "book"
+ ob.pt_edit(open(os.path.join(package_home(globals()),'zpt/zogiLibMain_%s.zpt'%layout)).read(),None)
+ if title:
+ ob.pt_setTitle(title)
+ try:
+ u = self.DestinationURL()
+ except AttributeError:
+ u = REQUEST['URL1']
+
+ u = "%s/%s" % (u, urllib.quote(id))
+ REQUEST.RESPONSE.redirect(u+'/manage_main')
+ return ''