--- ECHO_content/ECHO_collection.py	2005/11/03 15:58:16	1.248
+++ ECHO_content/ECHO_collection.py	2005/11/03 17:10:52	1.249
@@ -1040,11 +1040,11 @@ class ECHO_resource(CatalogAware,Folder,
     
 
 
-    def getMDValue(self,fieldName,empty=None,generic=None):
+    def getMDValue(self,fieldNameTest,empty=None,generic=None):
             """get md values"""
             #TODO: cache mappinghash
             
-            
+            fieldName=None
             if generic:
                 ct=self.contentType.replace(" ","_").lower()
                 
@@ -1062,19 +1062,21 @@ class ECHO_resource(CatalogAware,Folder,
                 if not fieldName and hasattr(self.standardMD,ct):    
                     fieldName=getattr(self.standardMD,ct).generateMappingHash()[fieldNameTest][0]
                     self._v_mapHash[ct][fieldNameTest]=fieldName
-            
+                    
             if not empty:
-                #FIXME: warum gibt es manchmal kein metadatahas
+  			   #FIXME: warum gibt es manchmal kein metadatahas
                 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)
+
+                return self.metaDataHash.get(fieldNameTest,empty)
 
     getFieldValue=getMDValue #depricated
-            
+
     def newMetaXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None,digiliburlprefix=None):
             """new index.meta"""
             self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
@@ -1306,7 +1308,7 @@ class ECHO_resource(CatalogAware,Folder,
             
             return "OK:",self.absolute_url(),self.contentType
         
-    def ECHO_getResourceMD(self,template="yes",back=None,overwrite="no"):
+    def ECHO_getResourceMD(self,template="yes",back=None):
         """Einlesen der Metadaten und Anlegen dieser Metadaten als Informationen zur Resource"""
         (metadict, error)=readMetadata(self.metalink)
 
@@ -1315,10 +1317,10 @@ class ECHO_resource(CatalogAware,Folder,
 
         if not error=="": #Fehler beim Auslesen des Metafiles
                 return "ERROR:",error
-        	
-        if (not self.contentType) or (overwrite=="yes"):
-                self.contentType=metadict['bib_type']
-
+        
+        if not self.contentType:
+                self.contentType=metadict['bib_type'].lower()
+                
         if not (metadict['bib_type'].lower()==self.contentType.lower()):
                 self.REQUEST.SESSION['contentStorage']=metadict['bib_type']
                 self.REQUEST.SESSION['contentZope']=self.contentType