--- ECHO_content/ECHO_collection.py 2007/01/31 13:43:36 1.283
+++ ECHO_content/ECHO_collection.py 2007/01/31 14:12:39 1.284
@@ -51,7 +51,7 @@ from Ft.Xml import EMPTY_NAMESPACE
import Ft.Xml.XPath
import cStringIO
-import zLOG
+
import sys
try:
@@ -80,9 +80,13 @@ except:
from ECHO_movie import *
import vlp_xmlhelpers #TODO: vlp elemente aus echo herausnehmen
import xmlrpclib
-
+import logging
+#ersetzt logging.info
+def logger(txt,method,txt2):
+ """logging"""
+ logging.info(txt+ txt2)
def normalizeCt(str):
"""normalizes content_type"""
@@ -619,7 +623,7 @@ class ECHO_resource(CatalogAware,Folder,
try:
urllib.urlopen(url)
except:
- zLOG.LOG("ECHO_Resource (getAccessRightMD)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
+ logger("ECHO_Resource (getAccessRightMD)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
return None,getattr(self,'accessRight','')
@@ -627,7 +631,7 @@ class ECHO_resource(CatalogAware,Folder,
try:
dom = NonvalidatingReader.parseUri(url)
except:
- zLOG.LOG("ECHO_Resource (getAccessRightMD)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
+ logger("ECHO_Resource (getAccessRightMD)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
return (None,"Cannot parse: "+url+"
"+"%s (%s)"%sys.exc_info()[0:2])
@@ -763,7 +767,7 @@ class ECHO_resource(CatalogAware,Folder,
if (not resourcepath) or (not digiliburlprefix) or (not images):
- zLOG.LOG("ECHO (createImageUrl)",zLOG.ERROR,"Cannot create ImageUrl for %s"%self.absolute_url())
+ logger("ECHO (createImageUrl)",logging.ERROR,"Cannot create ImageUrl for %s"%self.absolute_url())
return None
resourcepath=resourcepath.replace('/mpiwg/online','')
if not digiliburlprefix: digiliburlprefix="http://echo.mpiwg-berlin.mpg.de/zogilib?"
@@ -896,8 +900,8 @@ class ECHO_resource(CatalogAware,Folder,
break;
except:
- zLOG.LOG("ECHO_ressource (changeViewerTemplateSet)", zLOG.ERROR,"%s (%s)"%sys.exc_info()[0:2])
- zLOG.LOG("ECHO_ressource (changeViewerTemplateSet)", zLOG.ERROR,'http://echo.mpiwg-berlin.mpg.de/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params)))
+ logger("ECHO_ressource (changeViewerTemplateSet)", logging.ERROR,"%s (%s)"%sys.exc_info()[0:2])
+ logger("ECHO_ressource (changeViewerTemplateSet)", logging.ERROR,'http://echo.mpiwg-berlin.mpg.de/echo_nav/storage/downloadExternalXML?index_meta_url=%s&xml_url=%s'%(self.metalink,self.absolute_url()+'/newMetaXML'+urllib.quote('?'+params)))
#print self.absolute_url()+'/newMetaXML'+urllib.quote'?'+params)
# hack Pfad auf die Dokumente
path=self.metalink
@@ -913,8 +917,8 @@ class ECHO_resource(CatalogAware,Folder,
try:
return ECHO_helpers.urlopen("http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path).readlines()
except:
- zLOG.LOG("ECHO_Resource (changeViewerTemplateSet)", zLOG.INFO,"%s (%s)"%sys.exc_info()[0:2])
- zLOG.LOG("ECHO_Resource (changeViewerTemplateSet)", zLOG.INFO,"http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path)
+ logger("ECHO_Resource (changeViewerTemplateSet)", logging.INFO,"%s (%s)"%sys.exc_info()[0:2])
+ logger("ECHO_Resource (changeViewerTemplateSet)", logging.INFO,"http://nausikaa2.rz-berlin.mpg.de:86/cgi-bin/toc/admin/reg.cgi?path=%s"%path)
if RESPONSE is not None:
RESPONSE.redirect('manage_main')
@@ -936,17 +940,17 @@ class ECHO_resource(CatalogAware,Folder,
"""getFullTextXML; gives the FullText as an XML Document, and if somthing goes wrong."""
try:
- #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"open %s"%self.metalink)
+ #logger("ECHO Fulltext",logging.INFO,"open %s"%self.metalink)
fh=ECHO_helpers.urlopen(self.metalink)
- #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"opened %s"%self.metalink)
+ #logger("ECHO Fulltext",logging.INFO,"opened %s"%self.metalink)
dom=xml.dom.minidom.parse(fh)
texttools=dom.getElementsByTagName('texttool')
text=texttools[0].getElementsByTagName('text')
texturl=getText(text[0].childNodes)
- #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"found %s"%texturl)
+ #logger("ECHO Fulltext",logging.INFO,"found %s"%texturl)
fh.close()
- #zLOG.LOG("ECHO Fulltext",zLOG.INFO,"closed fh")
+ #logger("ECHO Fulltext",logging.INFO,"closed fh")
#keine url
if not (texturl.split(":")[0] in ['http','ftp','file']):
if not noredirect:
@@ -956,7 +960,7 @@ class ECHO_resource(CatalogAware,Folder,
if not noredirect:
self.REQUEST.RESPONSE.setHeader('Content-Type','text/xml')
- zLOG.LOG("ECHO Fulltext",zLOG.INFO,"redirect to:%s"%texturl)
+ logger("ECHO Fulltext",logging.INFO,"redirect to:%s"%texturl)
self.REQUEST.RESPONSE.redirect(texturl)
else:
return texturl
@@ -1279,7 +1283,7 @@ class ECHO_resource(CatalogAware,Folder,
self.metaDataHash[self.getFieldTag(tags,field)]=self.REQUEST.form[self.getFieldTag(tags,field)]
self.OSAS_meta[self.getFieldTag(tags,field)]=self.REQUEST.form['OSAS_%s'%self.getFieldTag(tags,field)]
except:
- zLOG.LOG("ECHO_collection (changeECHO_resource_metadata)",zLOG.ERROR,"%s (%s)"%sys.exc_info()[0:2])
+ logger("ECHO_collection (changeECHO_resource_metadata)",logging.ERROR,"%s (%s)"%sys.exc_info()[0:2])
print self.newMetaXML()
tries=0
@@ -1305,7 +1309,7 @@ class ECHO_resource(CatalogAware,Folder,
self.getMDValue('year',generic="yes"),self.getTitle()])
except:
- #zLOG.LOG(" ECHO_collection(getMDSimpleSearchField)",zLOG.INFO," ".join([self.getMDValue('title',generic="yes"),
+ #logger(" ECHO_collection(getMDSimpleSearchField)",logging.INFO," ".join([self.getMDValue('title',generic="yes"),
# self.getMDValue('author',generic="yes"),
# self.getMDValue('year',generic="yes"),'']))
return ""
@@ -1320,7 +1324,7 @@ class ECHO_resource(CatalogAware,Folder,
ct=self.contentType.replace(" ","_").lower()
ct=self.contentType.replace("-","_").lower()
else:
- zLOG.LOG("ECHO_collection (getMDValue)", zLOG.INFO, "no_content type for %s"%self.getId())
+ logger("ECHO_collection (getMDValue)", logging.INFO, "no_content type for %s"%self.getId())
ct=""
#caching
@@ -1348,14 +1352,14 @@ class ECHO_resource(CatalogAware,Folder,
ret =self.metaDataHash.get(fieldName,'!!NOT USED HERE in Type: %s'%normalizeCt(self.contentType))
except:
- zLOG.LOG("ECHO (line 1069)",zLOG.ERROR,"no md hash for %s"%self.getId())
+ logger("ECHO (line 1069)",logging.ERROR,"no md hash for %s"%self.getId())
return ""
else:
ret= self.metaDataHash.get(fieldNameTest,empty)
-
+
if type(ret) is StringType:
return ret.decode('utf-8')
else:
@@ -2434,7 +2438,7 @@ class ECHO_collection(CatalogAware, Fold
if ret and RESPONSE:
RESPONSE.write("ok: %s\n"%txt)
- #zLOG.LOG("ECHO (copyTitleToInfoXMLFolder)",zLOG.INFO,txt)
+ #logger("ECHO (copyTitleToInfoXMLFolder)",logging.INFO,txt)
if RESPONSE is not None:
RESPONSE.write("done!\n")
RESPONSE.close()