--- OSA_system2/OSAS_metadata.py	2005/10/10 18:11:10	1.9
+++ OSA_system2/OSAS_metadata.py	2005/11/24 19:01:33	1.12
@@ -110,7 +110,7 @@ class OSAS_MetadataMapping(SimpleItem):
         if RESPONSE is not None:
             RESPONSE.redirect('manage_main')
 
-    
+    manage_workspace=changeMetadataMappingForm    
 
 def manage_addMetadataMappingForm(self):
     """interface for adding the OSAS_root"""
@@ -124,7 +124,7 @@ def manage_addMetadataMapping(self,idOfO
     argList={}
     for arg in self.fieldList:
         if not (arg in ['idOfObject','titleOfObject']):
-            argList[arg]=(self.REQUEST.form[arg],self.REQUEST.form['label_'+arg],self.REQUEST.form['explanation_'+arg],arglist['status_'+fieldName],arglist['values_'+fieldName])
+            argList[arg]=(self.REQUEST.form[arg],self.REQUEST.form['label_'+arg],self.REQUEST.form['explanation_'+arg],self.REQUEST.form['status_'+arg],self.REQUEST.form['values_'+arg])
             
     newObj=OSAS_MetadataMapping(idOfObject,titleOfObject,argList)
     self._setObject(idOfObject,newObj)
@@ -184,29 +184,34 @@ class OSAS_Metadata(Folder):
     def generateMappingList(self):
         """Erzeuge Mapping"""
         mapping={}
+
         for dict in self.__dict__:
             #print dict
             obj=getattr(self,dict)
             if hasattr(obj,'meta_type'):
-                if obj.meta_type=="OSAS_MetadataMapping":
+                if obj.meta_type=="OSAS_MetadataMapping__neu":
                     mapping[obj.getId()]=obj.generateMappingHash()
+        
         return mapping
     
     def generateMappingForType(self,type,clean="yes"):
         """erzeuge spezifisches Mapping"""
+        
         hash=self.generateMappingList()
-        if hash.has_key(type):
-            if clean=="yes":
-                temp={}
-                for x in hash[type].keys():
-                    if not hash[type][x]=="":
-                        temp[x]=hash[type][x]
-                return temp
-            else:
-                return hash[type]
         
-        else:
-            return {}
+        for key in hash.keys():
+            if (key.lower() == type.lower()):
+                if clean=="yes":
+                    temp={}
+                    for x in hash[key].keys():
+                        if not hash[key][x]=="":
+                            temp[x]=hash[key][x]
+                    return temp
+                else:
+    
+                    return hash[key]
+            
+        return {}
 
     def getFieldList(self):
         """erzeuge string aus fields"""
@@ -215,6 +220,7 @@ class OSAS_Metadata(Folder):
         except:
             return ""
         
+    security.declarePublic('getFields')
     def getFields(self):
         """ausgabe der Felder"""
         return self.fieldList