'
- 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, 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()
+
def createAuxDiv(self):
"""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'
@@ -504,21 +637,30 @@ 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)
+ 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:
+ tp = "viewingTools.zpt"
+ if hasattr(self, tp):
+ pt = getattr(self, tp)
+ else:
+ pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/optionwindow.zpt')).__of__(self)
+
return pt()
def mark1(self):
@@ -589,15 +731,23 @@ 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()
-
def storeQuery(self, more = None):
"""storeQuery in session"""
dlParams = {}
@@ -610,88 +760,175 @@ 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:
modes=dlParams['mo'].split(',')
else:
modes=[]
-
- self.REQUEST.SESSION['query'] = dlParams
- self.REQUEST.SESSION['dlModes'] = modes
- self.REQUEST.SESSION['dlInfo'] = self.getDLInfo()
- self.REQUEST.SESSION['browserType'] = BrowserCheck(self)
+
+ wid = self.getWID()
+ self.REQUEST.set('wid', wid)
+ self.setSubSession('dlQuery', dlParams)
+ self.setSubSession('dlModes', modes)
+ self.setSubSession('dlInfo', self.getDLInfo())
+ 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.getSubSession('dlQuery')) :
print "ZOGILIB: have to store query!!"
- storeQuery(self)
+ self.storeQuery()
+ return
+
+ def zogilibPath(self, otherbase=None):
+ """returns an URL to the zogiLib instance"""
+ url = self.REQUEST['URL1']
+ # 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 += '/'
+ return url
+
+ def zogilibAction(self, action, otherbase=None, wid=None):
+ """returns a URL with zogilib path, action and wid"""
+ url = self.zogilibPath(otherbase)
+ url += action
+ if wid:
+ url += '?wid=' + wid
+ else:
+ url += '?wid=' + self.getWID()
+ return url
+
+ def getSubSession(self, key, default=None):
+ """returns an element from a session with a wid"""
+ wid = self.getWID()
+ return self.REQUEST.SESSION.get(key+'_'+wid, default)
+
+ def setSubSession(self, key, value):
+ """puts an element in a session with a wid"""
+ wid = self.getWID()
+ self.REQUEST.SESSION.set(key+'_'+wid, value)
+ return
+
+ def getWID(self):
+ """returns a (new) window id"""
+ wid = self.REQUEST.get('wid')
+ if not wid:
+ wid = 'digi_'+str(int(random.random()*10000))
+ print "new WID:", wid
+ return wid
def getDLParam(self, param):
"""returns parameter"""
try:
- return self.REQUEST.SESSION['query'][param]
+ return self.getSubSession('dlQuery').get(param)
except:
- return None
+ return
def setDLParam(self, param, value):
"""sets parameter"""
- self.REQUEST.SESSION['query'][param] = value
+ dlParams = self.getSubSession('dlQuery')
+ #try:
+ dlParams[param] = value
+ #except:
+ # self.setSubSession('dlQuery', {param: value})
return
def getAllDLParams(self):
"""parameter string for digilib"""
- dlParams = self.REQUEST.SESSION['query']
+ dlParams = self.getSubSession('dlQuery')
# save modes
- modes = self.REQUEST.SESSION['dlModes']
+ modes = self.getSubSession('dlModes')
dlParams['mo'] = string.join(modes, ',')
# 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('&')
def setDLParams(self,pn=None,ws=None,rot=None,brgt=None,cont=None):
"""setze Parameter"""
- ret=""
-
- if brgt:
- self.setDLParam('brgt', brgt)
- if cont:
- self.setDLParam('cont', cont)
+ self.setDLParam('brgt', brgt)
+ self.setDLParam('cont', cont)
+ self.setDLParam('ws', ws)
+ self.setDLParam('rot', rot)
if pn:
# unmark
self.setDLParam('mk', None)
self.setDLParam('pn', pn)
-
- if ws:
- self.setDLParam('ws', ws)
-
- if rot:
- self.setDLParam('rot', rot)
return self.display()
def display(self):
"""(re)display page"""
+ if not self.getDLParam('wid'):
+ wid = self.getWID()
+ self.setDLParam('wid', wid)
+
params = self.getAllDLParams()
+
if self.basePath:
self.REQUEST.RESPONSE.redirect(self.REQUEST['URL2']+'?'+params)
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.dlToolbarBaseURL+self.getAllDLParams()
+ return url
+
+ def getDLTarget(self):
+ """returns dlTarget"""
+ self.checkQuery()
+ s = self.dlTarget
+ if s == None:
+ s = ""
+# 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']
+ di = self.getSubSession('dlInfo')
if di:
return int(di['pt'])
else:
@@ -700,33 +937,31 @@ 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
+ ws = self.getDLParam('ws')
+ try:
+ return float(ws)+0.5
+ except:
+ return 1.5
def getSmallerWS(self):
"""ws-1"""
ws=self.getDLParam('ws')
- if ws:
- if int(ws)==1:
- return 1
- else:
- return int(ws)-1
- else:
+ try:
+ return max(float(ws)-0.5, 1)
+ except:
return 1
def hasMode(self, mode):
"""returns if mode is in the diglib mo parameter"""
- return (mode in self.REQUEST.SESSION['dlModes'])
+ wid = self.getWID()
+ return (mode in self.REQUEST.SESSION['dlModes_'+wid])
def hasNextPage(self):
"""returns if there is a next page"""
@@ -761,10 +996,22 @@ 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"""
- modes = self.REQUEST.SESSION['dlModes']
+ modes = self.getSubSession('dlModes')
if 'hmir' in modes:
modes.remove('hmir')
else:
@@ -774,7 +1021,7 @@ class zogiLib(Folder):
def dl_VMirror(self):
"""mirror action"""
- modes = self.REQUEST.SESSION['dlModes']
+ modes = self.getSubSession('dlModes')
if 'vmir' in modes:
modes.remove('vmir')
else:
@@ -796,10 +1043,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):
@@ -822,8 +1069,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):
@@ -895,33 +1142,115 @@ 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,dlServerURL, version, basePath, dlTarget, dlToolbarBaseURL, RESPONSE=None):
"""change it"""
self.title=title
- self.digilibBaseUrl=digilibBaseUrl
- self.localFileBase=localFileBase
+ self.dlServerURL=dlServerURL
self.basePath = basePath
self.layout=version
+ self.dlTarget = dlTarget
+
+ if dlToolbarBaseURL:
+ self.dlToolbarBaseURL = dlToolbarBaseURL
+ else:
+ self.dlToolbarBaseURL = dlServerURL + "/digimage.jsp?"
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
+
+
+ ##
+ ## odds and ends
+ ##
+
+ def repairZogilib(self, obj=None):
+ """change stuff that broke on upgrading"""
+
+ msg = ""
+
+ if not obj:
+ obj = self.getPhysicalRoot()
+
+ print "starting in ", obj
+
+ entries=obj.ZopeFind(obj,obj_metatypes=['zogiLib'],search_sub=1)
+
+ for entry in entries:
+ print " found ", entry
+ #
+ # replace digilibBaseUrl by dlServerURL
+ if hasattr(entry[1], 'digilibBaseUrl'):
+ msg += " fixing digilibBaseUrl in "+entry[0]+"\n"
+ entry[1].dlServerURL = re.sub('/servlet/Scaler\?','',entry[1].digilibBaseUrl)
+ del entry[1].digilibBaseUrl
+
+ #
+ # add dlToolbarBaseURL
+ if not hasattr(entry[1], 'dlToolbarBaseURL'):
+ msg += " fixing dlToolbarBaseURL in "+entry[0]+"\n"
+ entry[1].dlToolbarBaseURL = entry[1].dlServerURL + "/digimage.jsp?"
+
+ return msg+"\n\nfixed all zogilib instances in: "+obj.title
+
def manage_addZogiLibForm(self):
"""interface for adding zogilib"""
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,dlServerURL,version="book",basePath="",dlTarget=None,dlToolbarBaseURL=None,RESPONSE=None):
"""add dgilib"""
- newObj=zogiLib(id,title,digilibBaseUrl, localFileBase, version, basePath)
+ newObj=zogiLib(id,title,dlServerURL, version, basePath, dlTarget, dlToolbarBaseURL)
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 ''
+