ECHO_content/ECHO_Nav.py - diff

Return to ECHO_Nav.py CVS log

Up to [Repository] / ECHO_content

version 1.72, 2006/02/03 20:41:29	version 1.74, 2006/03/02 19:59:03
Line 437 class ECHO_navigation(Folder):	Line 437 class ECHO_navigation(Folder):
"""Navigations Element"""	"""Navigations Element"""
meta_type="ECHO_Navigation"	meta_type="ECHO_Navigation"
management_page_charset="utf-8"	management_page_charset="utf-8"

	def getUsername(self):
	"""get name of user"""
	username=str(self.REQUEST['AUTHENTICATED_USER'])
	if username=='Anonymous User':
	return None
	else:
	return username

def searchExternalCollection(self,url,simpleSearch):	def searchExternalCollection(self,url,simpleSearch):
"""search external collection via xmlrpc"""	"""search external collection via xmlrpc"""
server=xmlrpclib.Server(url)	server=xmlrpclib.Server(url)
Line 489 class ECHO_navigation(Folder):	Line 498 class ECHO_navigation(Folder):
if not str:	if not str:
return ""	return ""
if type(str) is StringType:	if type(str) is StringType:
	try:
return str.decode('utf-8')	return str.decode('utf-8')
	except:
	return str.decode('latin-1')
else:	else:

return str	return str