zogiLib/zogiLib.py - diff

Return to zogiLib.py CVS log

Up to [Repository] / zogiLib

Diff for /zogiLib/zogiLib.py between versions 1.36 and 1.37

version 1.36, 2004/07/22 17:30:21	version 1.37, 2004/07/23 15:28:21
Line 388 class zogiLib(Folder):	Line 388 class zogiLib(Folder):
{'label':'Main Config','action':'changeZogiLibForm'},	{'label':'Main Config','action':'changeZogiLibForm'},
)	)

def __init__(self, id, title, dlServerURL,localFileBase, version="book", basePath="", dlTarget=None):	def __init__(self, id, title, dlServerURL, layout="book", basePath="", dlTarget=None, dlToolbarBaseURL=None):
"""init"""	"""init"""

self.id=id	self.id=id
self.title=title	self.title=title
self.dlServerURL = dlServerURL	self.dlServerURL = dlServerURL

self.localFileBase=localFileBase
self.basePath=basePath	self.basePath=basePath
self.layout=version	self.layout=layout
if dlTarget:	if dlTarget:
self.dlTarget = dlTarget	self.dlTarget = dlTarget
else:	else:
self.dlTarget = "digilib"	self.dlTarget = "digilib"

	if dlToolbarBaseURL:
	self.dlToolbarBaseURL = dlToolbarBaseURL
	else:
	self.dlToolbarBaseURL = dlServerURL + "/digimage.jsp?"


def version(self):	def version(self):
"""version information"""	"""version information"""
return ZOGIVERSION	return ZOGIVERSION
Line 634 class zogiLib(Folder):	Line 638 class zogiLib(Folder):
self.checkQuery()	self.checkQuery()
if self.REQUEST.has_key('frametarget'):	if self.REQUEST.has_key('frametarget'):
self.dlTarget = self.REQUEST['frametarget']	self.dlTarget = self.REQUEST['frametarget']
print "current dltarget: ", self.dlTarget
bt = self.REQUEST.SESSION['browserType']	bt = self.REQUEST.SESSION['browserType']
if bt['staticHTML']:	if bt['staticHTML']:
pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/optionwindow_static.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/optionwindow_static.zpt')).__of__(self)
else:	else:
finds=self.ZopeFind(self,obj_ids=['viewingTools.zpt'])	tp = "viewingTools.zpt"
if finds:	if hasattr(self, tp):
	pt = getattr(self, tp)
return finds[0][1]()
else:	else:
pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/optionwindow.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/optionwindow.zpt')).__of__(self)

return pt()	return pt()

def mark1(self):	def mark1(self):
Line 844 class zogiLib(Folder):	Line 847 class zogiLib(Folder):

def getToolbarPageURL(self):	def getToolbarPageURL(self):
"""returns a toolbar-enabled page URL"""	"""returns a toolbar-enabled page URL"""
url=self.dlServerURL+'/digimage.jsp?'+self.getAllDLParams()	url=self.dlToolbarBaseURL+self.getAllDLParams()
return url	return url

def getDLTarget(self):	def getDLTarget(self):
Line 1094 class zogiLib(Folder):	Line 1097 class zogiLib(Folder):
pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/changeZogiLibForm.zpt')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/changeZogiLibForm.zpt')).__of__(self)
return pt()	return pt()

def changeZogiLib(self,title,dlServerURL, localFileBase, version, basePath, dlTarget, RESPONSE=None):	def changeZogiLib(self,title,dlServerURL, version, basePath, dlTarget, dlToolbarBaseURL, RESPONSE=None):
"""change it"""	"""change it"""
self.title=title	self.title=title
self.dlServerURL=dlServerURL	self.dlServerURL=dlServerURL
self.localFileBase=localFileBase
self.basePath = basePath	self.basePath = basePath
self.layout=version	self.layout=version
if dlTarget:	if dlTarget:
Line 1106 class zogiLib(Folder):	Line 1108 class zogiLib(Folder):
else:	else:
self.dlTarget = "digilib"	self.dlTarget = "digilib"

	if dlToolbarBaseURL:
	self.dlToolbarBaseURL = dlToolbarBaseURL
	else:
	self.dlToolbarBaseURL = dlServerURL + "/digimage.jsp?"

if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')

Line 1129 class zogiLib(Folder):	Line 1136 class zogiLib(Folder):

for entry in entries:	for entry in entries:
print " found ", entry	print " found ", entry
	#
	# replace digilibBaseUrl by dlServerURL
if hasattr(entry[1], 'digilibBaseUrl'):	if hasattr(entry[1], 'digilibBaseUrl'):
msg += " fixing "+entry[0]+"\n"	msg += " fixing digilibBaseUrl in "+entry[0]+"\n"
entry[1].dlServerURL = re.sub('/servlet/Scaler\?','',entry[1].digilibBaseUrl)	entry[1].dlServerURL = re.sub('/servlet/Scaler\?','',entry[1].digilibBaseUrl)
del 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	return msg+"\n\nfixed all zogilib instances in: "+obj.title


Line 1142 def manage_addZogiLibForm(self):	Line 1157 def manage_addZogiLibForm(self):
pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/addZogiLibForm')).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/addZogiLibForm')).__of__(self)
return pt()	return pt()

def manage_addZogiLib(self,id,title,dlServerURL, localFileBase,version="book",basePath="",dlTarget="digilib",RESPONSE=None):	def manage_addZogiLib(self,id,title,dlServerURL,layout="book",basePath="",dlTarget="digilib",dlToolbarBaseURL=None,RESPONSE=None):
"""add dgilib"""	"""add dgilib"""
newObj=zogiLib(id,title,dlServerURL, localFileBase, version, basePath, dlTarget)	newObj=zogiLib(id,title,dlServerURL, localFileBase, version, basePath, dlTarget, dlToolbarBaseURL)
self.Destination()._setObject(id,newObj)	self.Destination()._setObject(id,newObj)
if RESPONSE is not None:	if RESPONSE is not None:
RESPONSE.redirect('manage_main')	RESPONSE.redirect('manage_main')

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.36
changed lines
	Added in v.1.37