--- OSA_system2/OSAS_root.py 2005/10/10 18:11:11 1.12 +++ OSA_system2/OSAS_root.py 2007/01/31 14:30:30 1.13 @@ -16,7 +16,14 @@ from urlparse import * import re import xml.dom.minidom from types import * -import zLOG +import logging + +#ersetzt logging +def logger(txt,method,txt2): + """logging""" + logging.info(txt+ txt2) + + import os.path import Globals from Globals import package_home @@ -85,7 +92,7 @@ class OSAS_add_contextData(Folder): return curHandler.retStr.encode('utf-8') except: - zLOG.LOG('OSAS_Root (addFileToDollection)',zLOG.ERROR,'%s %s'%sys.exc_info()[:2]) + logger('OSAS_Root (addFileToDollection)',logging.ERROR,'%s %s'%sys.exc_info()[:2]) return URL return urllib.urlopen(URL).read() @@ -167,7 +174,7 @@ class OSAS_add_contextData(Folder): server=xmlrpclib.Server(collection,allow_none=True) retStr=server.addMovie(id,title,label,description,content_type,responsible,link,thumbUrl,rawFile,lowresFile,metalink,weight,credits) except: - zLOG.LOG('OSAS_Root (addFileToDollection2)',zLOG.ERROR,'%s %s'%sys.exc_info()[:2]) + logger('OSAS_Root (addFileToDollection2)',logging.ERROR,'%s %s'%sys.exc_info()[:2]) return "An Error occured adding the resource\n", collection,params #print "added" @@ -418,7 +425,7 @@ class OSAS_root(Folder,Implicit): dom=self.validateIndexMeta(xmlneu) if not dom: - zLOG.LOG('OSAS_Root (downloadExternalXML)',zLOG.ERROR,'cannot parse: %s', xml_url) + logger('OSAS_Root (downloadExternalXML)',logging.ERROR,'cannot parse: %s', xml_url) return "error"