--- ECHO_content/ECHO_collection.py	2005/10/28 17:49:45	1.245
+++ ECHO_content/ECHO_collection.py	2005/11/03 14:45:28	1.246
@@ -1062,8 +1062,12 @@ class ECHO_resource(CatalogAware,Folder,
                     self._v_mapHash[ct][fieldNameTest]=fieldName
                     
             if not empty:
-                    return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
-            
+		    #FIXME: warum gibt es manchmal kein metadatahash
+		    try:
+                         return self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%self.contentType)
+                    except:
+			  zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId()) 
+			  return ""           
             else:
                     return self.metaDataHash.get(fieldName,empty)
             
@@ -1298,7 +1302,7 @@ class ECHO_resource(CatalogAware,Folder,
             
             return "OK:",self.absolute_url().self,contentType
         
-    def ECHO_getResourceMD(self,template="yes",back=None):
+    def ECHO_getResourceMD(self,template="yes",back=None,overwrite="no"):
         """Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""
         (metadict, error)=readMetadata(self.metalink)
 
@@ -1307,10 +1311,10 @@ class ECHO_resource(CatalogAware,Folder,
 
         if not error=="": #Fehler beim Auslesen des Metafiles
                 return "ERROR:",error
-        
-        if not self.contentType:
-                self.contentType=metadict['bib_type'].lower()
-                
+        	
+        if (not self.contentType) or (overwrite=="yes"):
+                self.contentType=metadict['bib_type']
+
         if not (metadict['bib_type'].lower()==self.contentType.lower()):
                 self.REQUEST.SESSION['contentStorage']=metadict['bib_type']
                 self.REQUEST.SESSION['contentZope']=self.contentType