version 1.71, 2010/04/09 18:32:31
|
version 1.72, 2010/06/18 19:45:07
|
Line 411 class zogiLib(Folder):
|
Line 411 class zogiLib(Folder):
|
|
|
def getScalerUrl(self,requestString=""): |
def getScalerUrl(self,requestString=""): |
"""send scaler url""" |
"""send scaler url""" |
|
if requestString is None: |
|
requestString = "" |
if self.dlServerURL[-1] == '?': |
if self.dlServerURL[-1] == '?': |
# full Servlet URL |
# full Servlet URL |
return self.dlServerURL + requestString |
return self.dlServerURL + requestString |
Line 436 class zogiLib(Folder):
|
Line 438 class zogiLib(Folder):
|
if self.REQUEST.SESSION.has_key('scalerDiv'): |
if self.REQUEST.SESSION.has_key('scalerDiv'): |
(requestString, bottom, side, width, height) = self.REQUEST.SESSION['scalerDiv'] |
(requestString, bottom, side, width, height) = self.REQUEST.SESSION['scalerDiv'] |
# if not explicitly defined take normal request |
# if not explicitly defined take normal request |
if not requestString: |
|
requestString = self.getAllDLParams() |
|
url = self.getScalerUrl(requestString=requestString) |
url = self.getScalerUrl(requestString=requestString) |
# take insets from options if present |
# take insets from options if present |
if options is not None: |
if options is not None: |
Line 461 class zogiLib(Folder):
|
Line 461 class zogiLib(Folder):
|
tag += '<script type="text/javascript">' |
tag += '<script type="text/javascript">' |
tag += "var ps = bestPicSize(getElement('scaler'));" |
tag += "var ps = bestPicSize(getElement('scaler'));" |
# write img tag with javascript |
# write img tag with javascript |
|
if requestString: |
|
# take all parameters from requestString |
tag += 'document.write(\'<img id="pic" src="%s&dw=\'+(ps.width%s)+\'&dh=\'+(ps.height%s)+\'" />\');'%(url, s_par, b_par) |
tag += 'document.write(\'<img id="pic" src="%s&dw=\'+(ps.width%s)+\'&dh=\'+(ps.height%s)+\'" />\');'%(url, s_par, b_par) |
|
else: |
|
# use javascript to filter digilib parameters |
|
tag += """document.write('<img id="pic" src="%s'+getAllParameters(31)+'&dw='+(ps.width%s)+'&dh='+(ps.height%s)+'" />');"""%(url, s_par, b_par) |
|
|
tag += '</script>' |
tag += '</script>' |
if bt['isN4']: |
if bt['isN4']: |
tag += '</ilayer>' |
tag += '</ilayer>' |