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.80 and 1.89

version 1.80, 2007/01/31 14:12:39	version 1.89, 2008/08/21 07:58:21
Line 17 import ECHO_collection	Line 17 import ECHO_collection
import base64	import base64
import bz2	import bz2
import xmlrpclib	import xmlrpclib
	import sys
import logging	import logging

#erstzt logging	#erstzt logging
Line 25 def logger(txt,method,txt2):	Line 25 def logger(txt,method,txt2):
"""logging"""	"""logging"""
logging.info(txt+ txt2)	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','extVersionedFileFolder','ECHO_movie']


#decode and compress for xmlrpc communication with OSAS_server	#decode and compress for xmlrpc communication with OSAS_server
Line 35 def encodeRPC(string):	Line 35 def encodeRPC(string):
def decodeRPC(string):	def decodeRPC(string):
return bz2.decompress(base64.decodestring(string))	return bz2.decompress(base64.decodestring(string))

	def unicodify(s):
	"""decode str (utf-8 or latin-1 representation) into unicode object"""
	if not s:
	return u""
	if isinstance(s, str):
	try:
	return s.decode('utf-8')
	except:
	return s.decode('latin-1')
	else:
	return s

	def utf8ify(s):
	"""encode unicode object or string into byte string in utf-8 representation.
	assumes string objects to be utf-8"""
	if not s:
	return ""
	if isinstance(s, str):
	return s
	else:
	return s.encode('utf-8')


def content_html(self,type):	def content_html(self,type):
"""template fuer content"""	"""template fuer content"""
#templates = self.ZopeFind(self.aq_parent,obj_ids=[type+"_template"])	#templates = self.ZopeFind(self.aq_parent,obj_ids=[type+"_template"])
Line 43 def content_html(self,type):	Line 66 def content_html(self,type):
# return templates[0][1]()	# return templates[0][1]()

if hasattr(self,type+"_template"):	if hasattr(self,type+"_template"):
logging.info("type: %s"%type)
obj=getattr(self,type+"_template")	obj=getattr(self,type+"_template")
return obj()	return obj()
else:	else:
Line 61 class ECHO_basis:	Line 84 class ECHO_basis:
management_page_charset="utf-8"	management_page_charset="utf-8"
isVisible = True	isVisible = True


	def unicodify(self, s):
	"""return unicode object for string (utf-8 or latin1) or unicode object s"""
	return unicodify(s)

	# compatibility of old decode method
	decode = unicodify


	def utf8ify(self, s):
	"""return utf-8 encoded string object for string or unicode object s"""
	return utf8ify(s)


def manage_addECHO_locale(self,lang,title,label,text=None,content_type=None,RESPONSE=None):	def manage_addECHO_locale(self,lang,title,label,text=None,content_type=None,RESPONSE=None):
return ECHO_collection.manage_addECHO_locale(self,lang,title,label)	return ECHO_collection.manage_addECHO_locale(self,lang,title,label)

Line 356 class ECHO_basis:	Line 393 class ECHO_basis:
js+="""addArea('%s', 'overview', %s, '%s', '%s');\n"""%(ob.getFullId(),ob.getCoordString(),ob.getType(),perm)	js+="""addArea('%s', 'overview', %s, '%s', '%s');\n"""%(ob.getFullId(),ob.getCoordString(),ob.getType(),perm)
return js	return js

def createMapHead(self):	def createMapHead(self,mapColTypes=None):
"""create javascript include and script tags for head"""	"""create javascript include and script tags for head"""
pt=zptFile(self, 'zpt/ECHO_content_map_frag_js')	pt=zptFile(self, 'zpt/ECHO_content_map_frag_js')
return pt()	return pt(mapColTypes=mapColTypes)

def createMapImg(self):	def createMapImg(self):
"""generate img-tag for map"""	"""generate img-tag for map"""
Line 591 def getSubCols(self, sortfield=None,	Line 628 def getSubCols(self, sortfield=None,
isVisible=True):	isVisible=True):

def sort(x,y):	def sort(x,y):
	try:
	if type(x[0])==type(y[0]):
return cmp(x[0],y[0])	return cmp(x[0],y[0])
	else:
	if type(x[0])==types.StringType:
	tmpX=unicodify(x[0])
	tmpY=y[0]
	else:
	tmpY=unicodify(y[0])
	tmpX=x[0]
	return cmp(tmpX,tmpY)

	except:
	logging.error("Error at ECHO_helpers.sort:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")
	logging.error(" : %s %s"%sys.exc_info()[0:2])
	logging.error("Error at ECHO_helpers.sort:"+repr(x)+"--"+repr(type(x[0])))
	logging.error("Error at ECHO_helpers.sort:"+repr(y)+"--"+repr(type(y[0])))
	logging.error("Error at ECHO_helpers.sort:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB")
	return 0
def sortfnc(sortfield,x,y):	def sortfnc(sortfield,x,y):
try:	try:
xa=x[1].getMDValue(sortfield,generic=generic)	xa=x[1].getMDValue(sortfield,generic=generic)
Line 1164 class MapArea(SimpleItem):	Line 1218 class MapArea(SimpleItem):
parent = self.aq_parent	parent = self.aq_parent
text = parent.getMapText()	text = parent.getMapText()
if text is not None:	if text is not None:
return text.document_src()	#return text.document_src()
	return text()
return ""	return ""

def getLabel(self):	def getLabel(self):
Line 1219 class MapText(Folder,ZopePageTemplate):	Line 1274 class MapText(Folder,ZopePageTemplate):
self.ZBindings_edit(self._default_bindings)	self.ZBindings_edit(self._default_bindings)
if text is None:	if text is None:
text = open(self._default_content_fn).read()	text = open(self._default_content_fn).read()
	if content_type is None:
	content_type = self.content_type
self.pt_edit(text, content_type)	self.pt_edit(text, content_type)

def createLocale(self):	def createLocale(self):

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

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