--- zogiLib/zogiLib.py 2004/07/23 16:01:28 1.38
+++ zogiLib/zogiLib.py 2004/10/12 16:58:14 1.48
@@ -12,9 +12,10 @@ import re
import string
import urllib
import types
+import random
from Globals import package_home
-ZOGIVERSION = "0.9.7 ROC:23.7.2004"
+ZOGIVERSION = "0.9.10b ROC:12.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:
@@ -396,10 +407,7 @@ class zogiLib(Folder):
self.dlServerURL = dlServerURL
self.basePath=basePath
self.layout=layout
- if dlTarget:
- self.dlTarget = dlTarget
- else:
- self.dlTarget = "digilib"
+ self.dlTarget = dlTarget
if dlToolbarBaseURL:
self.dlToolbarBaseURL = dlToolbarBaseURL
@@ -452,11 +460,12 @@ 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=""
print label
@@ -474,6 +483,7 @@ class zogiLib(Folder):
ret+="""
%s: | %s |
"""%(label,text)
ret+=""
return ret
+
def getMetaData(self):
"""getMetaData"""
@@ -521,15 +531,20 @@ 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=self.dlServerURL+"/dlInfo-xml.jsp"
try:
- url=urllib.urlopen(baseUrl+self.REQUEST['QUERY_STRING'])
+ print "querying: ", baseUrl+'?'+self.REQUEST['QUERY_STRING']
+ url=urllib.urlopen(baseUrl+'?'+self.REQUEST['QUERY_STRING'])
+ print " ok, parsing..."
dom=xml.dom.minidom.parse(url)
+ print " ok"
params=dom.getElementsByTagName('parameter')
for param in params:
+ print " param: ", param.getAttribute('name'), " = ", param.getAttribute('value')
paramH[param.getAttribute('name')]=param.getAttribute('value')
return paramH
except:
@@ -539,7 +554,7 @@ class zogiLib(Folder):
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
@@ -636,8 +651,6 @@ class zogiLib(Folder):
def optionwindow(self):
"""showoptions"""
self.checkQuery()
- if self.REQUEST.has_key('frametarget'):
- self.dlTarget = self.REQUEST['frametarget']
bt = self.REQUEST.SESSION['browserType']
if bt['staticHTML']:
pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/optionwindow_static.zpt')).__of__(self)
@@ -735,7 +748,6 @@ class zogiLib(Folder):
return pt()
-
def storeQuery(self, more = None):
"""storeQuery in session"""
dlParams = {}
@@ -756,10 +768,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)
@@ -767,7 +781,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
@@ -786,24 +800,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 = ""
@@ -835,7 +882,12 @@ 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:
@@ -854,6 +906,8 @@ class zogiLib(Folder):
"""returns dlTarget"""
self.checkQuery()
s = self.dlTarget
+ if s == None:
+ s = ""
# s = 'dl'
# if self.getDLParam('fn'):
# s += "_" + self.getDLParam('fn')
@@ -874,7 +928,7 @@ class zogiLib(Folder):
def getPT(self):
"""pagenums"""
- di = self.REQUEST.SESSION['dlInfo']
+ di = self.getSubSession('dlInfo')
if di:
return int(di['pt'])
else:
@@ -906,7 +960,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"""
@@ -956,7 +1011,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:
@@ -966,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:
@@ -1103,10 +1158,7 @@ class zogiLib(Folder):
self.dlServerURL=dlServerURL
self.basePath = basePath
self.layout=version
- if dlTarget:
- self.dlTarget = dlTarget
- else:
- self.dlTarget = "digilib"
+ self.dlTarget = dlTarget
if dlToolbarBaseURL:
self.dlToolbarBaseURL = dlToolbarBaseURL
@@ -1119,7 +1171,7 @@ class zogiLib(Folder):
##
- ## odd stuff
+ ## odds and ends
##
def repairZogilib(self, obj=None):
@@ -1157,9 +1209,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,dlServerURL,layout="book",basePath="",dlTarget="digilib",dlToolbarBaseURL=None,RESPONSE=None):
+def manage_addZogiLib(self,id,title,dlServerURL,version="book",basePath="",dlTarget=None,dlToolbarBaseURL=None,RESPONSE=None):
"""add dgilib"""
- newObj=zogiLib(id,title,dlServerURL, localFileBase, version, basePath, dlTarget, dlToolbarBaseURL)
+ newObj=zogiLib(id,title,dlServerURL, version, basePath, dlTarget, dlToolbarBaseURL)
self.Destination()._setObject(id,newObj)
if RESPONSE is not None:
RESPONSE.redirect('manage_main')