ECHO_content/ECHO_helpers.py - diff

Return to ECHO_helpers.py CVS log

Up to [Repository] / ECHO_content

Diff for /ECHO_content/ECHO_helpers.py between versions 1.79 and 1.80

version 1.79, 2007/01/23 18:22:29	version 1.80, 2007/01/31 14:12:39
Line 17 import ECHO_collection	Line 17 import ECHO_collection
import base64	import base64
import bz2	import bz2
import xmlrpclib	import xmlrpclib
import zLOG
import logging	import logging

	#erstzt logging
	def logger(txt,method,txt2):
	"""logging"""
	logging.info(txt+ txt2)

displayTypes = ['ZSQLExtendFolder','ZSQLBibliography','ECHO_group','ECHO_collection','ECHO_resource','ECHO_link','ECHO_sqlElement','ECHO_pageTemplate','ECHO_externalLink','ImageCollectionIFrame','VLP_resource','VLP_essay','ECHO_ZCatalogElement','ImageCollection','versionedFileFolder','ECHO_movie']	displayTypes = ['ZSQLExtendFolder','ZSQLBibliography','ECHO_group','ECHO_collection','ECHO_resource','ECHO_link','ECHO_sqlElement','ECHO_pageTemplate','ECHO_externalLink','ImageCollectionIFrame','VLP_resource','VLP_essay','ECHO_ZCatalogElement','ImageCollection','versionedFileFolder','ECHO_movie']


Line 924 def writeMetadata(url,metadict,project=N	Line 929 def writeMetadata(url,metadict,project=N


except:	except:
zLOG.LOG("ECHO writeMetadata",zLOG.ERROR,"XCannot open: "+url)	logger("ECHO writeMetadata",logging.ERROR,"XCannot open: "+url)
return (None,"XCannot open: "+url)	return (None,"XCannot open: "+url)

try:	try:
dom=xml.dom.minidom.parseString(geturl)	dom=xml.dom.minidom.parseString(geturl)
except:	except:
zLOG.LOG("ECHO writeMetadata",zLOG.ERROR,"Cannot parse: "+url+"<br>"+geturl)	logger("ECHO writeMetadata",logging.ERROR,"Cannot parse: "+url+"<br>"+geturl)
return (None,"Cannot parse: "+url+"<br>"+geturl)	return (None,"Cannot parse: "+url+"<br>"+geturl)

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.79
changed lines
	Added in v.1.80