--- OSA_system2/OSAS_browser.py 2005/11/25 17:49:53 1.21 +++ OSA_system2/OSAS_browser.py 2010/02/15 19:09:10 1.23 @@ -8,7 +8,15 @@ from Products.PageTemplates.PageTemplate from OFS.Folder import Folder from OFS.SimpleItem import SimpleItem from Globals import InitializeClass,package_home -import zLOG + +import logging + +#ersetzt logging +def logger(txt,method,txt2): + """logging""" + logging.info(txt+ txt2) + + import base64 import bz2 import os @@ -25,7 +33,7 @@ def decodeRPC(string): class OSAS_storeOnline(SimpleItem): - """Webfrontend für das Storagesystem + """Webfrontend fuer das Storagesystem liefert Browserumgebung """ meta_type="OSAS_StoreOnline__neu" @@ -162,7 +170,7 @@ class OSAS_storeOnline(SimpleItem): dom = NonvalidatingReader.parseString(server.getFile(indexMeta),"http://www.mpiwg-berlin.mpg.de/") except: - zLOG.LOG("OSAS_browser (findEntryInIndexMeta)",zLOG.ERROR,"Cannot parse: %s"%indexMeta) + logger("OSAS_browser (findEntryInIndexMeta)",logging.ERROR,"Cannot parse: %s"%indexMeta) return None path=path.replace(realPath,'') @@ -208,7 +216,7 @@ class OSAS_storeOnline(SimpleItem): realPath=os.path.split(indexMeta)[0] path=path.replace(realPath,"") - if path and (path[0]==os.sep): #falls am Anfang os.sep steht lösche dieses. + if path and (path[0]==os.sep): #falls am Anfang os.sep steht loesche dieses. path=path[1:] @@ -222,7 +230,7 @@ class OSAS_storeOnline(SimpleItem): try: dom=xml.dom.minidom.parseString(server.getFile(indexMeta)) except: - zLOG.LOG("OSAS_browser (getSubDirsFromIndexMeta)",zLOG.ERROR,"Cannot parse: %s"%indexMeta) + logger("OSAS_browser (getSubDirsFromIndexMeta)",logging.ERROR,"Cannot parse: %s"%indexMeta) return ret dirs=[] @@ -298,14 +306,14 @@ class OSAS_storeOnline(SimpleItem): if metaDataId: metaData=getattr(self,metaDataId) if not (getattr(metaData,'meta_type','')=='OSAS_Metadata__neu'): - zLOG.LOG('OSAS_browser (readObjectsFromPath)',zLOG.ERROR,"%s is not OSAS_Metadata") + logger('OSAS_browser (readObjectsFromPath)',logging.ERROR,"%s is not OSAS_Metadata") metaData=None else: metaDatas=self.ZopeFind(self.aq_parent,obj_metatypes=['OSAS_Metadata__neu'],search_sub=1) if metaDatas: metaData=metaDatas[0][1] else: - zLOG.LOG('OSAS_browser (readObjectsFromPath)',zLOG.INFO,"There is no OSAS_Metadata Object") + logger('OSAS_browser (readObjectsFromPath)',logging.INFO,"There is no OSAS_Metadata Object") metaData=None #print "md",metaData