--- zogiLib/zogiLib.py 2004/07/19 17:54:02 1.33
+++ zogiLib/zogiLib.py 2004/10/05 17:43:53 1.46
@@ -12,9 +12,10 @@ import re
import string
import urllib
import types
+import random
from Globals import package_home
-ZOGIVERSION = "0.9.5 ROC:25.6.2004"
+ZOGIVERSION = "0.9.10b ROC:5.10.2004"
def cropf(f):
"""returns a float with reduced precision"""
@@ -22,7 +23,7 @@ def cropf(f):
def sendFile(self, filename, type):
- """sends an object or a local file (in the product) as response"""
+ """sends an object or a local file (from the product) as response"""
paths = filename.split('/')
object = self
# look for an object called filename
@@ -75,7 +76,11 @@ class zogiImage(Image):
"""init"""
self.id=id
self.title=title
- self.baseUrl=baseUrl
+ if baseUrl:
+ self.baseUrl=baseUrl
+ else:
+ self.baseUrl="http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary/servlet/Scaler?"
+
self.queryString=queryString
self.content_type=content_type
self.precondition=precondition
@@ -98,8 +103,13 @@ class zogiImage(Image):
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
-
def index_html(self, REQUEST, RESPONSE):
+ """service the request by redirecting to digilib server"""
+ print "REDIRECT: ", self.baseUrl+self.queryString
+ RESPONSE.redirect(self.baseUrl+self.queryString)
+ return ''
+
+ def index_html2(self, REQUEST, RESPONSE):
"""
Modified version of OFS/Image.py
@@ -350,6 +360,7 @@ class zogiImage(Image):
# for a cache manager to set response headers.
self.ZCacheable_set(None)
+ #return "zogiimage: "+self.baseUrl+self.queryString
data=urllib.urlopen(self.baseUrl+self.queryString).read()
if type(data) is type(''):
@@ -370,7 +381,7 @@ def manage_addZogiImageForm(self):
def manage_addZogiImage(self,id,title,baseUrl, queryString,RESPONSE=None):
- """add dgilib"""
+ """add zogiimage"""
newObj=zogiImage(id,title,baseUrl, queryString)
self.Destination()._setObject(id,newObj)
if RESPONSE is not None:
@@ -388,20 +399,21 @@ class zogiLib(Folder):
{'label':'Main Config','action':'changeZogiLibForm'},
)
- def __init__(self, id, title, digilibBaseUrl,localFileBase, version="book", basePath="", dlTarget=None):
+ def __init__(self, id, title, dlServerURL, layout="book", basePath="", dlTarget=None, dlToolbarBaseURL=None):
"""init"""
self.id=id
self.title=title
- self.digilibBaseUrl=digilibBaseUrl
-
- self.localFileBase=localFileBase
+ self.dlServerURL = dlServerURL
self.basePath=basePath
- self.layout=version
- if dlTarget:
- self.dlTarget = dlTarget
+ self.layout=layout
+ self.dlTarget = dlTarget
+
+ if dlToolbarBaseURL:
+ self.dlToolbarBaseURL = dlToolbarBaseURL
else:
- self.dlTarget = "digilib"
+ self.dlToolbarBaseURL = dlServerURL + "/digimage.jsp?"
+
def version(self):
"""version information"""
@@ -448,10 +460,11 @@ class zogiLib(Folder):
return ret
except:
- return ret
- def formatHTML(self,url,label=None,viewUrl=None):
+ return []
+
+ def formatHTML(self,url,label=None,viewUrl=None):
sets=xml.dom.minidom.parse(urllib.urlopen(url)).getElementsByTagName('dataset')
ret=""
@@ -470,6 +483,7 @@ class zogiLib(Folder):
ret+="""
%s: | %s |
"""%(label,text)
ret+=""
return ret
+
def getMetaData(self):
"""getMetaData"""
@@ -517,25 +531,26 @@ class zogiLib(Folder):
return self.formatHTML(link+'fn=%s&pn=%s&object=%s'%(fn,pn,ob),label,url)
return ret
+
def getDLInfo(self):
"""get DLInfo from digilib server"""
paramH={}
- baseUrl=re.sub("servlet/Scaler","dlInfo-xml.jsp",self.digilibBaseUrl)
+ baseUrl=self.dlServerURL+"/dlInfo-xml.jsp"
try:
- url=urllib.urlopen(baseUrl+self.REQUEST['QUERY_STRING'])
+ url=urllib.urlopen(baseUrl+'?'+self.REQUEST['QUERY_STRING'])
dom=xml.dom.minidom.parse(url)
params=dom.getElementsByTagName('parameter')
for param in params:
paramH[param.getAttribute('name')]=param.getAttribute('value')
return paramH
except:
- return null
+ return {}
def createHeadJS(self):
"""generate all javascript tags for head"""
self.checkQuery()
- bt = self.REQUEST.SESSION['browserType']
+ bt = self.REQUEST.SESSION.get('browserType', {})
if bt['staticHTML']:
return
@@ -563,7 +578,7 @@ class zogiLib(Folder):
# if not explicitly defined take normal request
if not requestString:
requestString = self.getAllDLParams()
- url = self.digilibBaseUrl+requestString
+ url = self.dlServerURL+'/servlet/Scaler?'+requestString
# construct bottom and side insets
b_par = ""
s_par = ""
@@ -623,11 +638,11 @@ class zogiLib(Folder):
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"""
@@ -636,13 +651,13 @@ class zogiLib(Folder):
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]()
+ 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()
+
+ return pt()
def mark1(self):
"""mark image"""
@@ -729,7 +744,6 @@ class zogiLib(Folder):
return pt()
-
def storeQuery(self, more = None):
"""storeQuery in session"""
dlParams = {}
@@ -750,10 +764,12 @@ class zogiLib(Folder):
modes=dlParams['mo'].split(',')
else:
modes=[]
-
- self.REQUEST.SESSION['query'] = dlParams
- self.REQUEST.SESSION['dlModes'] = modes
- self.REQUEST.SESSION['dlInfo'] = self.getDLInfo()
+
+ 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)
@@ -761,7 +777,7 @@ class zogiLib(Folder):
def checkQuery(self):
"""check if the query has been stored"""
- if not (self.REQUEST.SESSION and self.REQUEST.SESSION.has_key('query')) :
+ if not (self.REQUEST.SESSION and self.getSubSession('dlQuery')) :
print "ZOGILIB: have to store query!!"
self.storeQuery()
return
@@ -780,24 +796,57 @@ class zogiLib(Folder):
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
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 = ""
@@ -829,24 +878,32 @@ class zogiLib(Folder):
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):
- urlbase=re.sub('/servlet/Scaler','/dlContext-xml.jsp',self.digilibBaseUrl)
-
-
- return urlbase+self.getAllDLParams()
-
+ 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')
@@ -867,7 +924,7 @@ class zogiLib(Folder):
def getPT(self):
"""pagenums"""
- di = self.REQUEST.SESSION['dlInfo']
+ di = self.getSubSession('dlInfo_')
if di:
return int(di['pt'])
else:
@@ -899,7 +956,8 @@ class zogiLib(Folder):
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"""
@@ -949,7 +1007,7 @@ class zogiLib(Folder):
def dl_HMirror(self):
"""mirror action"""
- modes = self.REQUEST.SESSION['dlModes']
+ modes = self.getSubSession('dlModes')
if 'hmir' in modes:
modes.remove('hmir')
else:
@@ -959,7 +1017,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:
@@ -1090,30 +1148,66 @@ 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, dlTarget, 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
- if dlTarget:
- self.dlTarget = dlTarget
+ self.dlTarget = dlTarget
+
+ if dlToolbarBaseURL:
+ self.dlToolbarBaseURL = dlToolbarBaseURL
else:
- self.dlTarget = "digilib"
+ 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="",dlTarget="digilib",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, dlTarget)
+ newObj=zogiLib(id,title,dlServerURL, version, basePath, dlTarget, dlToolbarBaseURL)
self.Destination()._setObject(id,newObj)
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -1155,3 +1249,4 @@ def manage_addZogiLibPageTemplate(self,
u = "%s/%s" % (u, urllib.quote(id))
REQUEST.RESPONSE.redirect(u+'/manage_main')
return ''
+