--- ECHO_content/ECHO_collection.py	2005/10/26 17:09:20	1.242
+++ ECHO_content/ECHO_collection.py	2005/11/03 15:12:21	1.247
@@ -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')
@@ -1039,12 +1038,38 @@ class ECHO_resource(CatalogAware,Folder,
                     RESPONSE.redirect('manage_main')
 
 
-    def getMDValue(self,fieldName,empty=None):
+    def getMDValue(self,fieldName,empty=None,generic=None):
+            """get md values"""
+            #TODO: cache mappinghash
+            
+            
+            if generic:
+                ct=self.contentType.replace(" ","_").lower()
+                
+                #caching
+                if not hasattr(self,'_v_mapHash'): #noch keine cachevariable
+                    self._v_mapHash={}
+                    
+                tmp=self._v_mapHash.get(ct,None) 
+                if tmp: #teste ob type schon existiert
+                    fieldName=tmp.get(fieldNameTest,None)
+                else:
+                    self._v_mapHash[ct]={}
+                    
+                #noch nicht gecached    
+                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
+                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(fieldName,empty)
             
     def newMetaXML(self,project=None,startpage=None,xslt=None,thumbtemplate=None,topbar=None,digiLibTemplate=None,digiliburlprefix=None):
             """new index.meta"""
@@ -1154,20 +1179,6 @@ class ECHO_resource(CatalogAware,Folder,
             return field
 
     
-        
-    def getFieldValue(self,field):
-        """get value"""
-        
-        try:
-        
-            ret=self.metaDataHash[field]
-            if ret == "":
-                return None
-            else:
-                    
-                    return ret
-        except:
-            return None
 
     def getMetaDataHash(self):
             """md hash"""
@@ -1175,6 +1186,7 @@ class ECHO_resource(CatalogAware,Folder,
     
     def setFieldValue(self,field,value):
         """get value"""
+        #TODO: remove setFieldValue
         
         if not hasattr(self,'metaDataHash'):
                 setattr(self,'metaDataHash',{})
@@ -1184,8 +1196,9 @@ class ECHO_resource(CatalogAware,Folder,
     def copySearchFields(self):
             """copys metadatafields to the object"""
             fields=['author','title','year']
+            
             for field in fields:
-                    setattr(self,'MD_'+field,self.getFieldValue(field))
+                    setattr(self,'MD_'+field,self.getMDValue(field,generic="yes"))
     
 
     def findLabelsFromMapping(self,referenceType):
@@ -1236,9 +1249,7 @@ class ECHO_resource(CatalogAware,Folder,
         #self.referencetypes=temp[0:]
         
         
-        
-
-        
+    
 
         bibdata={}
         retdata={}
@@ -1289,7 +1300,9 @@ class ECHO_resource(CatalogAware,Folder,
             if RESPONSE:
                     return RESPONSE.redirect('manage_main')
             
-    def ECHO_getResourceMD(self,template="yes",back=None):
+            return "OK:",self.absolute_url().self,contentType
+        
+    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)
 
@@ -1298,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
@@ -1915,7 +1928,7 @@ class ECHO_collection(Folder, Persistent
                     
     def copySearchFields(self,RESPONSE=None):
             """copys import metadatafields to the object"""
-            resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'])
+            resources=self.ZopeFind(self,obj_metatypes=['ECHO_resource'],search_sub=1)
 
             for resource in resources:
 
@@ -1933,7 +1946,7 @@ class ECHO_collection(Folder, Persistent
     def reloadMetaDataFromStorage(self,RESPONSE=None):
             """copy metadata from the storage to ECHO"""
 
-            return reloadMetaDataFromStorage(self,RESPONSE=None)
+            return reloadMetaDataFromStorage(self,RESPONSE)
 
     
     def getPartnerCopyright(self,name,sonst="generic"):
@@ -2241,10 +2254,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"""