--- ECHO_content/ECHO_collection.py	2005/10/26 17:09:20	1.242
+++ ECHO_content/ECHO_collection.py	2005/10/28 13:25:01	1.244
@@ -946,8 +946,7 @@ class ECHO_resource(CatalogAware,Folder,
                 self.contentType=self.bib_type
                 for data in self.metadata:
                         data_neu=re.sub('-','_',data)
-                        self.meta
-                        DataHash[data_neu]=getattr(self,data)[0:]
+                        self.metaDataHash[data_neu]=getattr(self,data)[0:]
 
         
         pt=zptFile(self, 'zpt/ChangeECHO_resource_metadata.zpt')
@@ -2241,10 +2240,16 @@ class ECHO_collection(Folder, Persistent
         """template fuer content"""
         #print "NN",argv
         ret = ECHO_basis.content_html(self,'collection')
+        
         try:
-            return ret.decode('utf-8')
+                return ret.encode('utf-8')
         except:
-            return ret
+            
+            try: 
+                return ret.decode('latin-1')
+            except:
+                
+                return ret
              
     def getCredits(self):
         """Ausgabe der credits"""