MPIWGWeb/MPIWGProjects.py - diff

Return to MPIWGProjects.py CVS log

Up to [Repository] / MPIWGWeb

Diff for /MPIWGWeb/MPIWGProjects.py between versions 1.47.2.78 and 1.47.2.79

version 1.47.2.78, 2007/07/02 15:50:22	version 1.47.2.79, 2007/10/18 12:00:17
Line 110 def sortI(x,y):	Line 110 def sortI(x,y):
except:	except:
return cmp(x[1],y[1])	return cmp(x[1],y[1])


	def unicodify(str):
	"""decode str (utf-8 or latin-1 representation) into unicode object"""
	if not str:
	return ""
	if type(str) is StringType:
	try:
	return str.decode('utf-8')
	except:
	return str.decode('latin-1')
	else:
	return str

	def utf8ify(str):
	"""encode unicode object or string into byte string in utf-8 representation"""
	if not str:
	return ""
	if type(str) is StringType:
	return str
	else:
	return str.encode('utf-8')


class MPIWGLink(SimpleItem):	class MPIWGLink(SimpleItem):
"""create a symbolic link to another page"""	"""create a symbolic link to another page"""

Line 1594 class MPIWGProject(CatalogAware,Folder):	Line 1617 class MPIWGProject(CatalogAware,Folder):
meta_type='MPIWGProject'	meta_type='MPIWGProject'
default_catalog='ProjectCatalog'	default_catalog='ProjectCatalog'

	def decode(self,str):
	"""return unicode object"""
	return unicodify(str)

def sortedByPlace(self,metatype):	def sortedByPlace(self,metatype):
"""find metatype and sort by place"""	"""find metatype and sort by place"""
Line 2280 class MPIWGProject(CatalogAware,Folder):	Line 2306 class MPIWGProject(CatalogAware,Folder):
if (text5=="<br>") or (text5=="<br/>"):	if (text5=="<br>") or (text5=="<br/>"):
text5=""	text5=""

return text5.encode('utf-8')	logging.debug("getcontent: field=%s filter=%s -> %s"%(field,filter,repr(text5)))
	#return unicodify(text5)
	return utf8ify(text5) # return as utf-8 byte string


def showImagesOfPage(self,imageUrl=None):	def showImagesOfPage(self,imageUrl=None):
"""show Images of project"""	"""show Images of project"""

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

Removed from v.1.47.2.78
changed lines
	Added in v.1.47.2.79