--- zogiLib/zogiLib.py 2004/10/05 17:43:53 1.46 +++ zogiLib/zogiLib.py 2005/11/08 18:10:10 1.60 @@ -1,21 +1,24 @@ -from Products.PageTemplates.PageTemplateFile import PageTemplateFile +from AccessControl import ClassSecurityInfo +from Globals import package_home +from OFS.Folder import Folder +from OFS.Image import Image +from OFS.Image import File +from OFS.SimpleItem import SimpleItem from Products.PageTemplates.PageTemplate import PageTemplate +from Products.PageTemplates.PageTemplateFile import PageTemplateFile from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate -from OFS.Image import Image -from webdav.common import rfc1123_date - -import xml.dom.minidom -from OFS.Folder import Folder +from types import * +from Globals import package_home, ImageFile from xml_helpers import getUniqueElementText,getText +import cgi import os +import random import re import string import urllib -import types -import random -from Globals import package_home +import xml.dom.minidom -ZOGIVERSION = "0.9.10b ROC:5.10.2004" +ZOGIVERSION = "0.10.1b ROC 8.11.2005" def cropf(f): """returns a float with reduced precision""" @@ -29,18 +32,18 @@ def sendFile(self, filename, type): # look for an object called filename for path in paths: if hasattr(object, path): - object = getattr(object, path) - else: - object = None - break + object = getattr(object, path) + else: + object = None + break if object: - # if the object exists then send it - return object.index_html(self.REQUEST.REQUEST, self.REQUEST.RESPONSE) + # if the object exists then send it + return object.index_html(self.REQUEST.REQUEST, self.REQUEST.RESPONSE) else: - # send a local file with the given content-type - fn = os.path.join(package_home(globals()), filename) - self.REQUEST.RESPONSE.setHeader("Content-Type", type) - self.REQUEST.RESPONSE.write(file(fn).read()) + # send a local file with the given content-type + fn = os.path.join(package_home(globals()), filename) + self.REQUEST.RESPONSE.setHeader("Content-Type", type) + self.REQUEST.RESPONSE.write(file(fn).read()) return def browserCheck(self): @@ -48,12 +51,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'] @@ -63,11 +74,11 @@ def browserCheck(self): return bt -class zogiImage(Image): +class zogiImage(SimpleItem): """einzelnes Image""" meta_type="zogiImage" - manage_options=ZopePageTemplate.manage_options+( + manage_options=SimpleItem.manage_options+( {'label':'Main config','action':'changeZogiImageForm'}, ) @@ -85,9 +96,9 @@ class zogiImage(Image): self.content_type=content_type self.precondition=precondition - def getData(self): - """getUrlData""" - return urllib.urlopen(self.baseUrl+self.queryString) + #def getData(self): + # """getUrlData""" + # return urllib.urlopen(self.baseUrl+self.queryString) def changeZogiImageForm(self): """Main configuration""" @@ -105,275 +116,26 @@ class zogiImage(Image): 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 - - 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) - - #return "zogiimage: "+self.baseUrl+self.queryString - 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 - - return '' - - + def rescale(self,width=None,height=None): + """andere parameter im querystring""" + qs=cgi.parse_qs(self.queryString) + for x in qs.keys(): + if type(qs[x]) is ListType: + qs[x]=qs[x][0] + + if width: + qs['dw']=width + if height: + qs['dh']=height + + + qsneu=urllib.urlencode(qs) + self.queryString=qsneu + return "done" + def manage_addZogiImageForm(self): """Form for adding""" pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/addZogiImage.zpt')).__of__(self) @@ -390,11 +152,12 @@ 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'}, ) @@ -413,8 +176,52 @@ class zogiLib(Folder): self.dlToolbarBaseURL = dlToolbarBaseURL else: self.dlToolbarBaseURL = dlServerURL + "/digimage.jsp?" + + self.manage_addFolder('template') +# form templates + main_book = PageTemplateFile('zpt/main_book', globals()) + main_image = PageTemplateFile('zpt/main_image', globals()) + main_metaData = PageTemplateFile('zpt/main_metadata', globals()) + main_static = PageTemplateFile('zpt/main_static', globals()) + options = PageTemplateFile('zpt/options', globals()) + changeForm = PageTemplateFile('zpt/changeForm', globals()) + +# display templates + aux_divs = PageTemplateFile('zpt/aux_divs', globals()) + aux_divsN4 = PageTemplateFile('zpt/aux_divsN4', globals()) + img_div = PageTemplateFile('zpt/img_div', globals()) + +# javascripts + head_js = PageTemplateFile('zpt/head_js', globals()) + jslib_js = PageTemplateFile('js/baselib.js', globals()) + dllib_js = PageTemplateFile('js/dllib.js', globals()) + +# graphic files + arr_right = ImageFile('images/right.gif', globals()) + arr_left = ImageFile('images/left.gif', globals()) + arr_up = ImageFile('images/up.gif', globals()) + arr_down = ImageFile('images/down.gif', globals()) + mark1 = ImageFile('images/mark1.gif', globals()) + mark2 = ImageFile('images/mark2.gif', globals()) + mark3 = ImageFile('images/mark3.gif', globals()) + mark4 = ImageFile('images/mark4.gif', globals()) + mark5 = ImageFile('images/mark5.gif', globals()) + mark6 = ImageFile('images/mark6.gif', globals()) + mark7 = ImageFile('images/mark7.gif', globals()) + mark8 = ImageFile('images/mark8.gif', globals()) + corner1 = ImageFile('images/olinks.gif', globals()) + corner2 = ImageFile('images/orechts.gif', globals()) + corner3 = ImageFile('images/ulinks.gif', globals()) + corner4 = ImageFile('images/urechts.gif', globals()) + + + security.declareProtected('View','getLayout') + def getLayout(self): + """get Layout""" + return self.layout + def version(self): """version information""" return ZOGIVERSION @@ -468,7 +275,7 @@ class zogiLib(Folder): sets=xml.dom.minidom.parse(urllib.urlopen(url)).getElementsByTagName('dataset') ret="" - print label + #print label if label: ret+="""%s"""%(viewUrl,label) for set in sets: @@ -535,9 +342,10 @@ class zogiLib(Folder): def getDLInfo(self): """get DLInfo from digilib server""" paramH={} - baseUrl=self.dlServerURL+"/dlInfo-xml.jsp" + baseUrl=self.getDLBaseUrl()+"/dlInfo-xml.jsp" + print "getdlinfo: ", baseUrl try: - url=urllib.urlopen(baseUrl+'?'+self.REQUEST['QUERY_STRING']) + url=urllib.urlopen(baseUrl+'?'+self.getAllDLParams()) dom=xml.dom.minidom.parse(url) params=dom.getElementsByTagName('parameter') for param in params: @@ -547,38 +355,72 @@ class zogiLib(Folder): return {} - def createHeadJS(self): - """generate all javascript tags for head""" - self.checkQuery() - bt = self.REQUEST.SESSION.get('browserType', {}) - if bt['staticHTML']: - return - - pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/zogilib_head_js')).__of__(self) - return pt() + 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 createParamJS(self): - """generate javascript for parameters only""" - self.checkQuery() - bt = self.REQUEST.SESSION['browserType'] - if bt['staticHTML']: - return + def zogilibAction(self, action, otherbase=None): + """returns a URL with zogilib path and action""" + url = self.zogilibPath(otherbase) + url += action + url += '?' + self.getAllDLParams(); + return url + + def getDLBaseUrl(self): + """returns digilib base URL (sans servlet path)""" + if self.dlServerURL[-1] == '?': + # full Servlet URL -- remove last part + si = self.dlServerURL.rindex('/servlet/') + if si > 0: + return self.dlServerURL[:si] + else: + # no servlet part :-( + return "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary" + else: + return self.dlServerURL + - pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/zogilib_param_js')).__of__(self) - return pt() + def getScalerUrl(self,requestString=""): + """send scaler url""" + if self.dlServerURL[-1] == '?': + # full Servlet URL + return self.dlServerURL + requestString + else: + return self.dlServerURL+'/servlet/Scaler?'+requestString + + def scaledImage(self,requestString=None): + """scaled Image""" + + if not requestString: + requestString=self.REQUEST['QUERY_STRING'] + + self.REQUEST.RESPONSE.redirect(self.getScalerUrl(requestString)) + + return True + - def createScalerImg(self, requestString=None, bottom=0, side=0, width=500, height=500): """generate Scaler IMG Tag""" - self.checkQuery() - bt = self.REQUEST.SESSION['browserType'] + self.checkQuery() + bt = self.REQUEST.SESSION['browserType'] # override with parameters from session if self.REQUEST.SESSION.has_key('scalerDiv'): (requestString, bottom, side, width, height) = self.REQUEST.SESSION['scalerDiv'] # if not explicitly defined take normal request if not requestString: requestString = self.getAllDLParams() - url = self.dlServerURL+'/servlet/Scaler?'+requestString + url = self.getScalerUrl(requestString=requestString) # construct bottom and side insets b_par = "" s_par = "" @@ -607,7 +449,7 @@ class zogiLib(Folder): def createScalerDiv(self, requestString = None, bottom = 0, side = 0, width=500, height=500): """generate scaler img and table with navigation arrows""" - self.checkQuery() + self.checkQuery() if requestString != None or bottom != 0 or side != 0: self.REQUEST.SESSION['scalerDiv'] = (requestString, bottom, side, width, height) else: @@ -618,236 +460,84 @@ class zogiLib(Folder): 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['staticHTML']: - return - if bt['isN4']: - f = 'zpt/zogilib_divsN4.zpt' - else: - f = 'zpt/zogilib_divs.zpt' - pt=PageTemplateFile(os.path.join(package_home(globals()),f)).__of__(self) - return pt() - - - def option_js(self): - """javascript""" - return sendFile(self, 'js/option.js', 'text/plain') - - def dl_lib_js(self): - """javascript""" - return sendFile(self, 'js/dllib.js', 'text/plain') - - def js_lib_js(self): - """javascript""" - return sendFile(self, 'js/baselib.js', 'text/plain') - - def optionwindow(self): - """showoptions""" - 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): - """mark image""" - return sendFile(self, 'images/mark1.gif', 'image/gif') - - def mark2(self): - """mark image""" - return sendFile(self, 'images/mark2.gif', 'image/gif') - - def mark3(self): - """mark image""" - return sendFile(self, 'images/mark3.gif', 'image/gif') - - def mark4(self): - """mark image""" - return sendFile(self, 'images/mark4.gif', 'image/gif') - - def mark5(self): - """mark image""" - return sendFile(self, 'images/mark5.gif', 'image/gif') - - def mark6(self): - """mark image""" - return sendFile(self, 'images/mark6.gif', 'image/gif') - - def mark7(self): - """mark image""" - return sendFile(self, 'images/mark7.gif', 'image/gif') - - def mark8(self): - """mark image""" - return sendFile(self, 'images/mark8.gif', 'image/gif') - - def corner1(self): - """mark image""" - return sendFile(self, 'images/olinks.gif', 'image/gif') - - def corner2(self): - """mark image""" - return sendFile(self, 'images/orechts.gif', 'image/gif') - - def corner3(self): - """mark image""" - return sendFile(self, 'images/ulinks.gif', 'image/gif') - - def corner4(self): - """mark image""" - return sendFile(self, 'images/urechts.gif', 'image/gif') - - def up_img(self): - """mark image""" - return sendFile(self, 'images/up.gif', 'image/gif') - - def down_img(self): - """mark image""" - return sendFile(self, 'images/down.gif', 'image/gif') - - def left_img(self): - """mark image""" - return sendFile(self, 'images/left.gif', 'image/gif') - - def right_img(self): - """mark image""" - return sendFile(self, 'images/right.gif', 'image/gif') - - - def index_html(self): """main action""" - self.checkQuery() - bt = self.REQUEST.SESSION['browserType'] - tp = "zogiLibMainTemplate" + self.checkQuery() + tp = "main_template" + tpt = self.layout - if hasattr(self, tp): - pt = getattr(self, tp) - else: - tpt = self.layout - - if bt['staticHTML']: - tpt = "static" - - pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/zogiLibMain_%s'%tpt)).__of__(self) + if not hasattr(self, 'template'): + # create template folder if it doesn't exist + print "no template folder" + self.manage_addFolder('template') + print "template!" + pt = getattr(self.template, 'main_'+tpt) return pt() + def checkQuery(self): + """make shure that the query has been saved""" + if not self.REQUEST.has_key('dlParams'): + self.storeQuery() + if not self.REQUEST.SESSION.has_key('browserType'): + bt = browserCheck(self) + self.REQUEST.SESSION.set('browserType', bt) - def storeQuery(self, more = None): - """storeQuery in session""" - dlParams = {} + def storeQuery(self, more=None, withpt=False): + """parse query parameters into a hash in REQUEST""" + params = {} for fm in self.REQUEST.form.keys(): - dlParams[fm] = self.REQUEST.form[fm] + params[fm] = self.REQUEST.form[fm] # look for more if more: for fm in more.split('&'): try: pv = fm.split('=') - dlParams[pv[0]] = pv[1] + params[pv[0]] = pv[1] except: pass # parse digilib mode parameter - if 'mo' in dlParams: - if len(dlParams['mo']) > 0: - modes=dlParams['mo'].split(',') - else: - modes=[] + if 'mo' in params: + if len(params['mo']) > 0: + modes=params['mo'].split(',') + else: + modes = []; + + self.REQUEST.set('dlParams', params) + self.REQUEST.set('dlModes', modes) + + # trigger get pt (from dlInfo) if requested + if withpt: + pt = self.getPT() - 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 and self.getSubSession('dlQuery')) : - print "ZOGILIB: have to store query!!" - 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 + return params - def getDLParam(self, param): - """returns parameter""" + + def getDLParam(self, param, default=None): + """returns parameter or default""" + self.checkQuery() + dlParams = self.REQUEST.get('dlParams') try: - return self.getSubSession('dlQuery').get(param) + return dlParams[param] except: - return + return default def setDLParam(self, param, value): """sets parameter""" - dlParams = self.getSubSession('dlQuery') - #try: + self.checkQuery() + dlParams = self.REQUEST.get('dlParams') dlParams[param] = value - #except: - # self.setSubSession('dlQuery', {param: value}) return def getAllDLParams(self): """parameter string for digilib""" - dlParams = self.getSubSession('dlQuery') + self.checkQuery() + dlParams = self.REQUEST.get('dlParams') # save modes - modes = self.getSubSession('dlModes') - dlParams['mo'] = string.join(modes, ',') + modes = self.REQUEST.get('dlModes') + if modes: + dlParams['mo'] = string.join(modes, ',') # assemble query string ret = "" for param in dlParams.keys(): @@ -858,7 +548,6 @@ class zogiLib(Folder): # omit trailing "&" return ret.rstrip('&') - def setDLParams(self,pn=None,ws=None,rot=None,brgt=None,cont=None): """setze Parameter""" @@ -878,10 +567,6 @@ 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: @@ -911,53 +596,28 @@ class zogiLib(Folder): # 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 getPN(self): + """pagenums""" + pn = int(self.getDLParam('pn', 1)) + return pn + def getPT(self): """pagenums""" - di = self.getSubSession('dlInfo_') - if di: - return int(di['pt']) - else: - return 1 + pt = self.getDLParam('pt', None) + if pt is None: + # get pt from dlInfo + if self.REQUEST.has_key('dlInfo'): + info = self.REQUEST.get('dlInfo') + else: + info = self.getDLInfo() + self.REQUEST.set('dlInfo', info) + pt = int(info.get('pt', 1)) + self.setDLParam('pt', pt) + return int(pt) - def getPN(self): - """Pagenum""" - pn = self.getDLParam('pn') - try: - return int(pn) - except: - return 1 - - def getBiggerWS(self): - """ws+1""" - ws = self.getDLParam('ws') - try: - return float(ws)+0.5 - except: - return 1.5 - - def getSmallerWS(self): - """ws-1""" - ws=self.getDLParam('ws') - try: - return max(float(ws)-0.5, 1) - except: - return 1 - def hasMode(self, mode): """returns if mode is in the diglib mo parameter""" - wid = self.getWID() - return (mode in self.REQUEST.SESSION['dlModes_'+wid]) + return (mode in self.REQUEST.get('dlModes')) def hasNextPage(self): """returns if there is a next page""" @@ -1128,16 +788,6 @@ class zogiLib(Folder): self.setDLParam('mk', None) return self.display() - def dl_Unmark(self): - """action to remove last mark""" - mk = self.getDLParam('mk') - if mk: - marks = mk.split(',') - marks.pop() - mk = string.join(marks, ',') - self.setDLParam('mk', mk) - return self.display() - def dl_db(self,db): """set db""" self.setDLParam('db',db)