ECHO_content/ECHO_helpers.py - diff

Return to ECHO_helpers.py CVS log

Up to [Repository] / ECHO_content

Diff for /ECHO_content/ECHO_helpers.py between versions 1.32 and 1.33

version 1.32, 2004/12/10 19:33:09	version 1.33, 2005/01/18 15:40:03
Line 580 def checkDiffs(self,metadict):	Line 580 def checkDiffs(self,metadict):
return diffs	return diffs


def zptFile(self, path):	def zptFile(self, path, orphaned=False):
"""returns a page template file from the product"""	"""returns a page template file from the product"""
	if orphaned:
	# unusual case (only for macro templates)
	pt=PageTemplateFile(os.path.join(package_home(globals()), path))
	else:
pt=PageTemplateFile(os.path.join(package_home(globals()), path)).__of__(self)	pt=PageTemplateFile(os.path.join(package_home(globals()), path)).__of__(self)
return pt	return pt


def sendFile(self, filename, type):	def findObjectPath(startobject, filename):
"""sends an object or a local file (in the product) as response"""	"""returns the object with the filename starting at startobject"""
	if startobject is None:
	return None
paths = filename.split('/')	paths = filename.split('/')
object = self	object = startobject
# look for an object called filename
for path in paths:	for path in paths:
if hasattr(object, path):	if hasattr(object, path):
object = getattr(object, path)	object = getattr(object, path)
else:	else:
object = None	object = None
break	break
	return object


	def zptObjectOrFile(self, filename, localdir='zpt', orphaned=False):
	"""returns a page template instance or a file from the product"""
	# look for an object called path
	pt = findObjectPath(self, filename)
	if pt is None:
	# get a ZPT file
	pt = zptFile(self, localdir+'/'+filename, orphaned=orphaned)
	return pt


	def sendFile(self, filename, type):
	"""sends an object or a local file (in the product) as response"""
	# look for an object called filename
	object = findObjectPath(self, filename)
if object:	if object:
# if the object exists then send it	# if the object exists then send it
return object.index_html(self.REQUEST.REQUEST, self.REQUEST.RESPONSE)	return object.index_html(self.REQUEST.REQUEST, self.REQUEST.RESPONSE)

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

Removed from v.1.32
changed lines
	Added in v.1.33