--- OSA_system2/OSAS_metadata.py	2005/10/10 19:10:33	1.10
+++ OSA_system2/OSAS_metadata.py	2007/01/31 14:30:29	1.16
@@ -10,7 +10,14 @@ import sys
 import xml.dom.minidom
 import xml.dom.pulldom
 import OSAS_helpers
-import zLOG
+import logging
+
+#ersetzt logging
+def logger(txt,method,txt2):
+    """logging"""
+    logging.info(txt+ txt2)
+
+
 import string
 try:
     from xml.xpath import Evaluate
@@ -124,7 +131,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)
@@ -189,7 +196,6 @@ class OSAS_Metadata(Folder):
             #print dict
             obj=getattr(self,dict)
             if hasattr(obj,'meta_type'):
-                print obj.meta_type
                 if obj.meta_type=="OSAS_MetadataMapping__neu":
                     mapping[obj.getId()]=obj.generateMappingHash()
         
@@ -221,6 +227,7 @@ class OSAS_Metadata(Folder):
         except:
             return ""
         
+    security.declarePublic('getFields')
     def getFields(self):
         """ausgabe der Felder"""
         return self.fieldList
@@ -248,12 +255,12 @@ class OSAS_Metadata(Folder):
         
         types=[]
 
-        for obj in self.ZopeFind(self,obj_metatypes=['OSAS_MetadataMapping_neu']):
-             if obj.title=="":
-                 title=obj.id
-             else:
-                 title=obj.title
-             types.append((obj.id,title,obj))
+        for obj in self.ZopeFind(self,obj_metatypes=['OSAS_MetadataMapping__neu']):
+	    if obj[1].title=="":
+		title=obj[1].id
+	    else:
+		title=obj[1].title
+	    types.append((obj[1].id, title, obj[1]))
 
         return types
 
@@ -307,7 +314,7 @@ class OSAS_Metadata(Folder):
         try:
             dom=xml.dom.minidom.parseString(indexMeta)
         except:
-            zLOG.LOG("OSAS_metadata (getDisplayFieldsAsStr)",zLOG.INFO,"Cannot parse: %s"%indexMeta)
+            logger("OSAS_metadata (getDisplayFieldsAsStr)",logging.INFO,"Cannot parse: %s"%indexMeta)
         try:
             bib = dom.getElementsByTagName("meta")[0].getElementsByTagName("bib")[0]
         except:
@@ -577,6 +584,8 @@ class OSAS_Metadata(Folder):
                 actualNode.appendChild(namenode)
                 
         ret=newdoc.toxml(encoding='utf-8')
+        zLOG.LOG("OSAS_metadata (writeMetadata)",zLOG.INFO,"write: %s"%ret)
+
 
         server.writeMetaDataFile(indexFile,ret)
 
@@ -602,7 +611,7 @@ class OSAS_Metadata(Folder):
 
         if list=="":
             return None
-        listsplit=list.split("\n")
+        listsplit=[i.rstrip() for i in list.split("\n")]
         return listsplit
 
     def showHelp(self,refType,genericTag):