--- OSA_system2/OSAS_metadata.py 2005/11/29 10:34:03 1.13 +++ 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 @@ -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,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):