MPIWGWeb/MPIWGProjects.py - diff

Return to MPIWGProjects.py CVS log

Up to [Repository] / MPIWGWeb

Diff for /MPIWGWeb/MPIWGProjects.py between versions 1.12 and 1.17

version 1.12, 2004/07/08 07:04:31	version 1.17, 2004/07/29 12:10:10
Line 100 class MPIWGRoot(ZSQLExtendFolder):	Line 100 class MPIWGRoot(ZSQLExtendFolder):
"""sort names"""	"""sort names"""

def sortLastName(x_c,y_c):	def sortLastName(x_c,y_c):
	try:
	x=urllib.unquote(x_c).encode('utf-8','ignore')
	except:
x=urllib.unquote(x_c)	x=urllib.unquote(x_c)
y=urllib.unquote(y_c)
	try:
	y=urllib.unquote(y_c).encode('utf-8','ignore')
	except:
	x=urllib.unquote(y_c)



try:	try:
last_x=x.split()[len(x.split())-1]	last_x=x.split()[len(x.split())-1]
Line 198 class MPIWGRoot(ZSQLExtendFolder):	Line 207 class MPIWGRoot(ZSQLExtendFolder):
RESPONSE.redirect("showHistoricalPersons")	RESPONSE.redirect("showHistoricalPersons")


	def getPersonDict(self,name):
	"""name von dict"""

	try:
	return self.personDict[name][0].encode('utf-8')
	except:
	return self.personDict[name][0]
	return self.personDict[name][0].decode('latin-1').encode('utf-8')


def showHistoricalPersons(self):	def showHistoricalPersons(self):
"""show persons"""	"""show persons"""
pt=PageTemplateFile('Products/MPIWGWeb/zpt/showHistoricalPersons').__of__(self)	pt=PageTemplateFile('Products/MPIWGWeb/zpt/showHistoricalPersons').__of__(self)
Line 263 class MPIWGRoot(ZSQLExtendFolder):	Line 282 class MPIWGRoot(ZSQLExtendFolder):
if re.match(searchStr,project[1]):	if re.match(searchStr,project[1]):

if depth:	if depth:
print "ho"
if int(depth)>=len(project[1].split("."))-len(childs.split(".")):	if int(depth)>=len(project[1].split("."))-len(childs.split(".")):

ret.append(project)	ret.append(project)
Line 393 class MPIWGRoot(ZSQLExtendFolder):	Line 412 class MPIWGRoot(ZSQLExtendFolder):
splittedId=idNr.split(".")	splittedId=idNr.split(".")
depth=len(splittedId)	depth=len(splittedId)
nr=idNr	nr=idNr
title=project[0].WEB_title	#title=project[0].WEB_title
	title=[project[0].getContent('WEB_title')]
	#print title
returnList.append((depth,nr,title,project[0]))	returnList.append((depth,nr,title,project[0]))

return returnList	return returnList

	def formatElementForOverview(self,element):
	"""format the element for output in overview"""
	if element[0]==1: #department
	return "<h2>Department %s: %s</h2>"%(element[3].getContent('xdata_05'),element[3].getContent('WEB_title'))

	elif element[0]==2: #mainprojects
	return "<h3>%s</h3><p>"%(element[3].getContent('WEB_title'))

	elif element[0]==3:
	return "<br>%s"%(element[2])

def changePosition(self,treeId,select,RESPONSE=None):	def changePosition(self,treeId,select,RESPONSE=None):
"""Change Postion Entry"""	"""Change Postion Entry"""
numbers=[]	numbers=[]
Line 457 class MPIWGRoot(ZSQLExtendFolder):	Line 488 class MPIWGRoot(ZSQLExtendFolder):



	def getRelativeUrlFromPerson(self,list):
	"""get urls to person list"""
	ret=[]
	persons=list.split(";")
	for person in persons:

	if len(person)>1: #nicht nur Trennzeichen
	splitted=person.split(",")
	if len(splitted)==1:
	splitted=person.split(" ")
	splittedNew=[re.sub(r'\s(.*)','$1',split) for split in splitted]
	if splittedNew[0]=='':
	del splittedNew[0]
	search=string.join(splittedNew,' AND ')

	if not search=='':

	try:
	proj=self.MembersCatalog({'title':search})
	except:
	proj=None

	if proj:
	#ret.append("<a href=%s >%s</a>"%(proj[0].absolute_url,person.encode('utf-8')))
	ret.append("<a href=%s >%s</a>"%('members/'+proj[0].id,person))
	else:
	#ret.append("%s"%person.encode('utf-8'))
	ret.append("%s"%person)
	return string.join(ret,";")


def getUrlFromPerson(self,list):	def getUrlFromPerson(self,list):
Line 691 class MPIWGProject(Folder):	Line 751 class MPIWGProject(Folder):
"""giveListofDatafields"""	"""giveListofDatafields"""
ret=[]	ret=[]
for x in range(1,14):	for x in range(1,14):
	if not x in [6,10,9]: # not used fields
ret.append('xdata_%02i'%x)	ret.append('xdata_%02i'%x)
return ret	return ret

Line 717 class MPIWGProject(Folder):	Line 778 class MPIWGProject(Folder):
try:	try:
text =x.encode('utf-8')	text =x.encode('utf-8')
except:	except:
text="ERROR"	text=x.decode('latin-1').encode('utf-8')

#delete separator (;) if is there is one	#delete separator (;) if is there is one
try:	try:
Line 726 class MPIWGProject(Folder):	Line 787 class MPIWGProject(Folder):
except:	except:
"""nothing"""	"""nothing"""

	if (type(text)==StringType) or (type(text)==UnicodeType):
return text	return text
	else:
	return text[0]


def show_html(self):	def show_html(self):

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

Removed from v.1.12
changed lines
	Added in v.1.17