--- OSAS/OSA_system/OSAS_metadata.py	2004/04/05 21:54:42	1.5
+++ OSAS/OSA_system/OSAS_metadata.py	2004/04/08 16:50:01	1.6
@@ -29,15 +29,16 @@ class OSAS_MetadataMapping(SimpleItem):
 
     def readFieldsFromParent(self):
         """read all elements from root"""
+        #print self.getId()
         return self.aq_parent.fieldList
     
-    def __init__(self,id,title,arglist):
+    def __init__(self,id,title,arglist,fieldList):
         """init"""
         self.id=id
         self.title=title
         self.fields=[]
         
-        for fieldName in self.readFieldsFromParent():
+        for fieldName in fieldList:
             setattr(self,"md_"+fieldName,arglist[fieldName])
             self.fields.append(arglist[fieldName])
             
@@ -47,6 +48,8 @@ class OSAS_MetadataMapping(SimpleItem):
 
     def getValue(self,fieldName):
         """get md value"""
+        print self.__dict__
+        print self,fieldName,getattr(self,"md_"+fieldName)
         try:
             return getattr(self,"md_"+fieldName)
         except:
@@ -76,7 +79,7 @@ class OSAS_MetadataMapping(SimpleItem):
         
         for fieldName in self.readFieldsFromParent():
 
-            setattr(self,"md_"+fieldName,arglist[fieldName])
+            setattr(self,"md_"+fieldName,(arglist[fieldName],arglist['label_'+fieldName],arglist['explanation_'+fieldName]))
             self.fields.append(arglist[fieldName])
             
         if RESPONSE is not None:
@@ -93,11 +96,11 @@ def manage_addOSAS_MetadataMapping(self,
     """add the OSAS_root"""
     
     argList={}
-    for arg in self.REQUEST.form.keys():
+    for arg in self.fieldList:
         if not (arg in ['idOfObject','titleOfObject']):
-            argList[arg]=self.REQUEST.form[arg]
-        
-    newObj=OSAS_MetadataMapping(idOfObject,titleOfObject,argList)
+            argList[arg]=(self.REQUEST.form[arg],self.REQUEST.form['label_'+arg],self.REQUEST.form['explanation_'+arg])
+            
+    newObj=OSAS_MetadataMapping(idOfObject,titleOfObject,argList,self.fieldList)
     self._setObject(idOfObject,newObj)
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')
@@ -219,6 +222,9 @@ class OSAS_add_Metadata(Folder):
     def add6(self):
         """write new index.meta file"""
         return OSAS_add.add6(self)
+
+        
+  
     
 def manage_AddOSAS_add_MetadataForm(self):
     """interface for adding the OSAS_add_Metadata"""