--- zogiLib/zogiLib.py 2004/06/07 17:56:55 1.26
+++ zogiLib/zogiLib.py 2005/02/23 18:38:43 1.54
@@ -1,22 +1,28 @@
-
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.PageTemplates.PageTemplate import PageTemplate
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
from OFS.Image import Image
-from webdav.common import rfc1123_date
-
+from AccessControl import ClassSecurityInfo
import xml.dom.minidom
from OFS.Folder import Folder
-from xml_helpers import getText
+from xml_helpers import getUniqueElementText,getText
import os
import re
import string
import urllib
import types
+import random
from Globals import package_home
+ZOGIVERSION = "0.9.15b DW:22.2.2005"
+
+def cropf(f):
+ """returns a float with reduced precision"""
+ return float(int(f * 10000)/10000.0)
+
+
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
@@ -41,12 +47,20 @@ def browserCheck(self):
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['isIE'] = False
+ bt['isN4'] = False
+ if string.find(ua, 'MSIE') > -1:
+ bt['isIE'] = True
+ else:
+ bt['isN4'] = (string.find(ua, 'Mozilla/4.') > -1)
+
+ try:
+ nav = ua[string.find(ua, '('):]
+ ie = string.split(nav, "; ")[1]
+ if string.find(ie, "MSIE") > -1:
+ bt['versIE'] = string.split(ie, " ")[1]
+ except: pass
+
bt['isMac'] = string.find(ua, 'Macintosh') > -1
bt['isWin'] = string.find(ua, 'Windows') > -1
bt['isIEWin'] = bt['isIE'] and bt['isWin']
@@ -55,49 +69,6 @@ def browserCheck(self):
return bt
-def manage_addZogiLibMainTemplateForm(self):
- """Form for adding"""
- #FIXME:???
- pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/AddOSAS_thumbTemplate.zpt')).__of__(self)
- return pt()
-
-
-
-
-def manage_addZogiLibMainTemplate(self, id,title=None, text=None,
- REQUEST=None, submit=None):
- "Add a Page Template with optional file content."
- #FIXME:???
- id = str(id)
- if REQUEST is None:
- self._setObject(id, zogiLib_mainTemplate(id, text))
- ob = getattr(self, id)
-
- if title:
- ob.pt_setTitle(title)
- return ob
- else:
- file = REQUEST.form.get('file')
- headers = getattr(file, 'headers', None)
- if headers is None or not file.filename:
- zpt = zogiLib_mainTemplate(id)
- else:
- zpt = zogiLib_mainTemplate(id, file, headers.get('content_type'))
-
- self._setObject(id, zpt)
- ob = getattr(self, id)
-
-
- try:
- u = self.DestinationURL()
- except AttributeError:
- u = REQUEST['URL1']
-
- if submit == " Add and Edit ":
- u = "%s/%s" % (u, quote(id))
- REQUEST.RESPONSE.redirect(u+'/manage_main')
- return ''
-
class zogiImage(Image):
"""einzelnes Image"""
@@ -112,7 +83,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
@@ -135,269 +110,11 @@ class zogiImage(Image):
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
-
def index_html(self, REQUEST, RESPONSE):
- """
- Modified version of OFS/Image.py
-
- The default view of the contents of a File or Image.
-
- Returns the contents of the file or image. Also, sets the
- Content-Type HTTP header to the objects content type.
- """
-
- # HTTP If-Modified-Since header handling.
- header=REQUEST.get_header('If-Modified-Since', None)
- if header is not None:
- header=header.split( ';')[0]
- # Some proxies seem to send invalid date strings for this
- # header. If the date string is not valid, we ignore it
- # rather than raise an error to be generally consistent
- # with common servers such as Apache (which can usually
- # understand the screwy date string as a lucky side effect
- # of the way they parse it).
- # This happens to be what RFC2616 tells us to do in the face of an
- # invalid date.
- try: mod_since=long(DateTime(header).timeTime())
- except: mod_since=None
- if mod_since is not None:
- if self._p_mtime:
- last_mod = long(self._p_mtime)
- else:
- last_mod = long(0)
- if last_mod > 0 and last_mod <= mod_since:
- # Set header values since apache caching will return Content-Length
- # of 0 in response if size is not set here
- RESPONSE.setHeader('Last-Modified', rfc1123_date(self._p_mtime))
- RESPONSE.setHeader('Content-Type', self.content_type)
- RESPONSE.setHeader('Content-Length', self.size)
- RESPONSE.setHeader('Accept-Ranges', 'bytes')
- self.ZCacheable_set(None)
- RESPONSE.setStatus(304)
- return ''
-
- if self.precondition and hasattr(self,self.precondition):
- # Grab whatever precondition was defined and then
- # execute it. The precondition will raise an exception
- # if something violates its terms.
- c=getattr(self,self.precondition)
- if hasattr(c,'isDocTemp') and c.isDocTemp:
- c(REQUEST['PARENTS'][1],REQUEST)
- else:
- c()
-
- # HTTP Range header handling
- range = REQUEST.get_header('Range', None)
- request_range = REQUEST.get_header('Request-Range', None)
- if request_range is not None:
- # Netscape 2 through 4 and MSIE 3 implement a draft version
- # Later on, we need to serve a different mime-type as well.
- range = request_range
- if_range = REQUEST.get_header('If-Range', None)
- if range is not None:
- ranges = HTTPRangeSupport.parseRange(range)
-
- if if_range is not None:
- # Only send ranges if the data isn't modified, otherwise send
- # the whole object. Support both ETags and Last-Modified dates!
- if len(if_range) > 1 and if_range[:2] == 'ts':
- # ETag:
- if if_range != self.http__etag():
- # Modified, so send a normal response. We delete
- # the ranges, which causes us to skip to the 200
- # response.
- ranges = None
- else:
- # Date
- date = if_range.split( ';')[0]
- try: mod_since=long(DateTime(date).timeTime())
- except: mod_since=None
- if mod_since is not None:
- if self._p_mtime:
- last_mod = long(self._p_mtime)
- else:
- last_mod = long(0)
- if last_mod > mod_since:
- # Modified, so send a normal response. We delete
- # the ranges, which causes us to skip to the 200
- # response.
- ranges = None
-
- if ranges:
- # Search for satisfiable ranges.
- satisfiable = 0
- for start, end in ranges:
- if start < self.size:
- satisfiable = 1
- break
-
- if not satisfiable:
- RESPONSE.setHeader('Content-Range',
- 'bytes */%d' % self.size)
- RESPONSE.setHeader('Accept-Ranges', 'bytes')
- RESPONSE.setHeader('Last-Modified',
- rfc1123_date(self._p_mtime))
- RESPONSE.setHeader('Content-Type', self.content_type)
- RESPONSE.setHeader('Content-Length', self.size)
- RESPONSE.setStatus(416)
- return ''
-
- ranges = HTTPRangeSupport.expandRanges(ranges, self.size)
-
- if len(ranges) == 1:
- # Easy case, set extra header and return partial set.
- start, end = ranges[0]
- size = end - start
-
- RESPONSE.setHeader('Last-Modified',
- rfc1123_date(self._p_mtime))
- RESPONSE.setHeader('Content-Type', self.content_type)
- RESPONSE.setHeader('Content-Length', size)
- RESPONSE.setHeader('Accept-Ranges', 'bytes')
- RESPONSE.setHeader('Content-Range',
- 'bytes %d-%d/%d' % (start, end - 1, self.size))
- RESPONSE.setStatus(206) # Partial content
-
- data = urllib.urlopen(self.baseUrl+self.queryString).read()
- if type(data) is StringType:
- return data[start:end]
-
- # Linked Pdata objects. Urgh.
- pos = 0
- while data is not None:
- l = len(data.data)
- pos = pos + l
- if pos > start:
- # We are within the range
- lstart = l - (pos - start)
-
- if lstart < 0: lstart = 0
-
- # find the endpoint
- if end <= pos:
- lend = l - (pos - end)
-
- # Send and end transmission
- RESPONSE.write(data[lstart:lend])
- break
-
- # Not yet at the end, transmit what we have.
- RESPONSE.write(data[lstart:])
-
- data = data.next
-
- return ''
-
- else:
- boundary = choose_boundary()
-
- # Calculate the content length
- size = (8 + len(boundary) + # End marker length
- len(ranges) * ( # Constant lenght per set
- 49 + len(boundary) + len(self.content_type) +
- len('%d' % self.size)))
- for start, end in ranges:
- # Variable length per set
- size = (size + len('%d%d' % (start, end - 1)) +
- end - start)
-
-
- # Some clients implement an earlier draft of the spec, they
- # will only accept x-byteranges.
- draftprefix = (request_range is not None) and 'x-' or ''
-
- RESPONSE.setHeader('Content-Length', size)
- RESPONSE.setHeader('Accept-Ranges', 'bytes')
- RESPONSE.setHeader('Last-Modified',
- rfc1123_date(self._p_mtime))
- RESPONSE.setHeader('Content-Type',
- 'multipart/%sbyteranges; boundary=%s' % (
- draftprefix, boundary))
- RESPONSE.setStatus(206) # Partial content
-
- data = urllib.urlopen(self.baseUrl+self.queryString).read()
- # The Pdata map allows us to jump into the Pdata chain
- # arbitrarily during out-of-order range searching.
- pdata_map = {}
- pdata_map[0] = data
-
- for start, end in ranges:
- RESPONSE.write('\r\n--%s\r\n' % boundary)
- RESPONSE.write('Content-Type: %s\r\n' %
- self.content_type)
- RESPONSE.write(
- 'Content-Range: bytes %d-%d/%d\r\n\r\n' % (
- start, end - 1, self.size))
-
- if type(data) is StringType:
- RESPONSE.write(data[start:end])
-
- else:
- # Yippee. Linked Pdata objects. The following
- # calculations allow us to fast-forward through the
- # Pdata chain without a lot of dereferencing if we
- # did the work already.
- first_size = len(pdata_map[0].data)
- if start < first_size:
- closest_pos = 0
- else:
- closest_pos = (
- ((start - first_size) >> 16 << 16) +
- first_size)
- pos = min(closest_pos, max(pdata_map.keys()))
- data = pdata_map[pos]
-
- while data is not None:
- l = len(data.data)
- pos = pos + l
- if pos > start:
- # We are within the range
- lstart = l - (pos - start)
-
- if lstart < 0: lstart = 0
-
- # find the endpoint
- if end <= pos:
- lend = l - (pos - end)
-
- # Send and loop to next range
- RESPONSE.write(data[lstart:lend])
- break
-
- # Not yet at the end, transmit what we have.
- RESPONSE.write(data[lstart:])
-
- data = data.next
- # Store a reference to a Pdata chain link so we
- # don't have to deref during this request again.
- pdata_map[pos] = data
-
- # Do not keep the link references around.
- del pdata_map
-
- RESPONSE.write('\r\n--%s--\r\n' % boundary)
- return ''
-
- RESPONSE.setHeader('Last-Modified', rfc1123_date(self._p_mtime))
- RESPONSE.setHeader('Content-Type', self.content_type)
- RESPONSE.setHeader('Content-Length', self.size)
- RESPONSE.setHeader('Accept-Ranges', 'bytes')
-
- # Don't cache the data itself, but provide an opportunity
- # for a cache manager to set response headers.
- self.ZCacheable_set(None)
-
- data=urllib.urlopen(self.baseUrl+self.queryString).read()
-
- if type(data) is type(''):
- RESPONSE.setBase(None)
- return data
-
- while data is not None:
- RESPONSE.write(data.data)
- data=data.next
-
+ """service the request by redirecting to digilib server"""
+ RESPONSE.redirect(self.baseUrl+self.queryString)
return ''
+
def manage_addZogiImageForm(self):
@@ -407,7 +124,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:
@@ -416,44 +133,172 @@ def manage_addZogiImage(self,id,title,ba
class zogiLib(Folder):
- """StandardElement"""
+ """digilib frontend with ZOPE"""
meta_type="zogiLib"
-
+ #xxxx
+ security=ClassSecurityInfo()
+
manage_options = Folder.manage_options+(
{'label':'Main Config','action':'changeZogiLibForm'},
)
- def __init__(self, id, title, digilibBaseUrl, localFileBase, version="book", basePath=""):
+ 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
+ self.layout=layout
+ self.dlTarget = dlTarget
+
+ if dlToolbarBaseURL:
+ self.dlToolbarBaseURL = dlToolbarBaseURL
+ else:
+ self.dlToolbarBaseURL = dlServerURL + "/digimage.jsp?"
+
+ security.declareProtected('View','getLayout')
+ def getLayout(self):
+ """get Layout"""
+ return self.layout
+
+ def version(self):
+ """version information"""
+ return ZOGIVERSION
+
+ def getContextStatic(self):
+ """get all the contexts which go to static pages"""
+
+ try:
+ dom=xml.dom.minidom.parse(urllib.urlopen(self.getMetaFileName()))
+ contexts=dom.getElementsByTagName("context")
+
+ ret=[]
+ for context in contexts:
+ name=getUniqueElementText(context.getElementsByTagName("name"))
+
+ link=getUniqueElementText(context.getElementsByTagName("link"))
+ if name or link:
+ ret.append((name,link))
+ return ret
+ except:
+ return []
+
+ def getContextDatabases(self):
+ """get all dynamic contexts"""
+ try:
+ dom=xml.dom.minidom.parse(urllib.urlopen(self.getMetaFileName()))
+ contexts=dom.getElementsByTagName("context")
+ ret=[]
+ for context in contexts:
+ metaDataLinks=context.getElementsByTagName("meta-datalink")
+ for metaDataLink in metaDataLinks:
+ db=metaDataLink.getAttribute("db")
+ link=self.REQUEST['URL1']+"/dl_db?db=%s"%db
+ if db:
+ ret.append((db,link))
+ metaDataLinks=context.getElementsByTagName("meta-baselink")
+
+ for metaDataLink in metaDataLinks:
+ db=metaDataLink.getAttribute("db")
+ link=self.REQUEST['URL1']+"/dl_db?db=%s"%db
+ if db:
+ ret.append((db,link))
+
+ return ret
+ except:
+
+ return []
+
+
+ def formatHTML(self,url,label=None,viewUrl=None):
+
+ sets=xml.dom.minidom.parse(urllib.urlopen(url)).getElementsByTagName('dataset')
+ ret=""
+ print label
+ if label:
+ ret+="""%s"""%(viewUrl,label)
+ for set in sets:
+ ret+=""
+ for node in set.childNodes:
+ if hasattr(node,'tagName'):
+ tag=node.tagName
+ label=node.getAttribute("label")
+ if not label:
+ label=tag
+ text=getText(node.childNodes)
+ ret+="""| %s: | %s |
"""%(label,text)
+ ret+="
"
+ return ret
+
+
+ def getMetaData(self):
+ """getMetaData"""
+ try:
+ dom=xml.dom.minidom.parse(urllib.urlopen(self.getMetaFileName()))
+ except:
+ return "error metadata"
+
+ contexts=dom.getElementsByTagName("context")
+ ret=[]
+ db=self.getDLParam("db")
+ ob=self.getDLParam("object")
+
+ fn=self.getDLParam("fn")
+ pn=self.getDLParam("pn")
+ if not fn:
+ fn=""
+ if not pn:
+ pn=""
+ if not ob:
+ ob=""
+
+ for context in contexts:
+ metaDataLinks=context.getElementsByTagName("meta-datalink")
+ for metaDataLink in metaDataLinks:
+
+ if (db==metaDataLink.getAttribute("db")) or (len(metaDataLinks)==1):
+
+ link=getUniqueElementText(metaDataLink.getElementsByTagName("metadata-url"))
+ label=getUniqueElementText(metaDataLink.getElementsByTagName("label"))
+ url=getUniqueElementText(metaDataLink.getElementsByTagName("url"))
+
+ return self.formatHTML(link,label,url)
+
+ metaDataLinks=context.getElementsByTagName("meta-baselink")
+
+ for metaDataLink in metaDataLinks:
+
+ if db==metaDataLink.getAttribute("db") or (len(metaDataLinks)==1):
+
+ link=getUniqueElementText(metaDataLink.getElementsByTagName("metadata-url"))
+ label=getUniqueElementText(metaDataLink.getElementsByTagName("label"))
+ url=getUniqueElementText(metaDataLink.getElementsByTagName("url"))
+
+ 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
@@ -481,7 +326,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 = ""
@@ -536,17 +381,16 @@ 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"""
@@ -555,7 +399,12 @@ class zogiLib(Folder):
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)
+ 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):
@@ -629,10 +478,12 @@ class zogiLib(Folder):
self.checkQuery()
bt = self.REQUEST.SESSION['browserType']
tp = "zogiLibMainTemplate"
+
if hasattr(self, tp):
pt = getattr(self, tp)
else:
tpt = self.layout
+
if bt['staticHTML']:
tpt = "static"
@@ -641,7 +492,6 @@ class zogiLib(Folder):
return pt()
-
def storeQuery(self, more = None):
"""storeQuery in session"""
dlParams = {}
@@ -662,10 +512,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)
@@ -673,7 +525,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
@@ -692,31 +544,66 @@ 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"""
+ def getDLParam(self, param, default=None):
+ """returns parameter or default"""
try:
- return self.REQUEST.SESSION['query'][param]
+ return self.getSubSession('dlQuery').get(param, default)
except:
- return
+ return default
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('&')
@@ -739,12 +626,38 @@ 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):
+ 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"""
@@ -759,7 +672,7 @@ class zogiLib(Folder):
def getPT(self):
"""pagenums"""
- di = self.REQUEST.SESSION['dlInfo']
+ di = self.getSubSession('dlInfo')
if di:
return int(di['pt'])
else:
@@ -791,7 +704,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"""
@@ -841,7 +755,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:
@@ -851,7 +765,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:
@@ -873,10 +787,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):
@@ -899,8 +813,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):
@@ -972,33 +886,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 ''
+