--- OSA_system2/OSAS_metadata.py	2005/11/29 10:34:03	1.13
+++ OSA_system2/OSAS_metadata.py	2010/02/15 19:09:10	1.17
@@ -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
@@ -134,7 +141,7 @@ def manage_addMetadataMapping(self,idOfO
    
 
 class OSAS_Metadata(Folder):
-    """Foldertype enthält methoden zur Halbautomatischen Erstellung von Metadatenfiles"""
+    """Foldertype enthaelt methoden zur Halbautomatischen Erstellung von Metadatenfiles"""
     security=ClassSecurityInfo()
     
     def __init__(self,id,shortDescription,description,fields):
@@ -244,7 +251,7 @@ class OSAS_Metadata(Folder):
         
         
     def getStoredTypes(self):
-        """Gebe gespeicherte typen zurück"""
+        """Gebe gespeicherte typen zurueck"""
         
         types=[]
 
@@ -300,14 +307,14 @@ class OSAS_Metadata(Folder):
         except:
             return ""
     def getDisplayFieldsAsStrOLD(self,indexMeta):
-        """Gebe display fields als string zurück
+        """Gebe display fields als string zurueck
         @param path: Pfad zum Object
         """
         ret=[]
         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,7 +584,7 @@ class OSAS_Metadata(Folder):
                 actualNode.appendChild(namenode)
                 
         ret=newdoc.toxml(encoding='utf-8')
-	zLOG.LOG("OSAS_metadata (writeMetadata)",zLOG.INFO,"write: %s"%ret)
+        zLOG.LOG("OSAS_metadata (writeMetadata)",zLOG.INFO,"write: %s"%ret)
 
 
         server.writeMetaDataFile(indexFile,ret)
@@ -604,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):