ECHO_content/ECHO_collection.py - diff

Return to ECHO_collection.py CVS log

Up to [Repository] / ECHO_content

version 1.242, 2005/10/26 17:09:20	version 1.243, 2005/10/28 10:23:04
Line 946 class ECHO_resource(CatalogAware,Folder,	Line 946 class ECHO_resource(CatalogAware,Folder,
self.contentType=self.bib_type	self.contentType=self.bib_type
for data in self.metadata:	for data in self.metadata:
data_neu=re.sub('-','_',data)	data_neu=re.sub('-','_',data)
self.meta	self.metaDataHash[data_neu]=getattr(self,data)[0:]
DataHash[data_neu]=getattr(self,data)[0:]


pt=zptFile(self, 'zpt/ChangeECHO_resource_metadata.zpt')	pt=zptFile(self, 'zpt/ChangeECHO_resource_metadata.zpt')
Line 2241 class ECHO_collection(Folder, Persistent	Line 2240 class ECHO_collection(Folder, Persistent
"""template fuer content"""	"""template fuer content"""
#print "NN",argv	#print "NN",argv
ret = ECHO_basis.content_html(self,'collection')	ret = ECHO_basis.content_html(self,'collection')

try:	try:
return ret.decode('utf-8')	return ret.encode('utf-8')
	except:

	try:
	ret.decode('utf-8')
except:	except:
return ret	return ret