MPIWGWeb/MPIWGProjects.py - diff

Return to MPIWGProjects.py CVS log

Up to [Repository] / MPIWGWeb

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

version 1.17, 2004/07/29 12:10:10	version 1.21, 2004/08/16 14:19:42
Line 29 def sortF(x,y):	Line 29 def sortF(x,y):
try:	try:
return cmp(x[1],y[1])	return cmp(x[1],y[1])
except:	except:
	try:
	return cmp(str(x[1]),str(y[1]))
	except:
	print "error",x[1],y[1]
return 0	return 0

def sortI(x,y):	def sortI(x,y):
Line 80 class MPIWGRoot(ZSQLExtendFolder):	Line 84 class MPIWGRoot(ZSQLExtendFolder):
"""format"""	"""format"""
return formatBibliography(here,found)	return formatBibliography(here,found)

def getValue(self,field):	def getValue(self,fieldStr):
"""Inhalt des Feldes"""	"""Inhalt des Feldes"""

if type(field)==StringType:	if type(fieldStr)==StringType:
	field=fieldStr
	else:
	field=fieldStr[0]
try:	try:
if field[len(field)-1]==";":	if field[len(field)-1]==";":
field=field[0:len(text)-1]	field=field[0:len(field)-1]
except:	except:
"""nothing"""

	"""nothing"""
	field=re.sub(r';([^\s])','; \g<1>',field)
return field.encode('utf-8')	return field.encode('utf-8')

else:
return field[0].encode('utf-8')


def sortedNames(self,list):	def sortedNames(self,list):
Line 381 class MPIWGRoot(ZSQLExtendFolder):	Line 387 class MPIWGRoot(ZSQLExtendFolder):
for x in self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff']):	for x in self.ZopeFind(self.members,obj_metatypes=['MPIWGStaff']):
ret.append(x[1].title.decode('utf-8'))	ret.append(x[1].title.decode('utf-8'))

#ret.sort()	ret.sort()
#print ret	#print ret

return ret	return ret
Line 422 class MPIWGRoot(ZSQLExtendFolder):	Line 428 class MPIWGRoot(ZSQLExtendFolder):
def formatElementForOverview(self,element):	def formatElementForOverview(self,element):
"""format the element for output in overview"""	"""format the element for output in overview"""
if element[0]==1: #department	if element[0]==1: #department
return "<h2>Department %s: %s</h2>"%(element[3].getContent('xdata_05'),element[3].getContent('WEB_title'))	return """<h2><a href="%s">Department %s: %s</a></h2>"""%(element[3].absolute_url(),element[3].getContent('xdata_05'),element[3].getContent('WEB_title'))

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

elif element[0]==3:	elif element[0]==3:
return "<br>%s"%(element[2])	return """<a href="%s">%s</a><br>"""%(element[3].absolute_url(),element[3].getContent('WEB_title'))

def changePosition(self,treeId,select,RESPONSE=None):	def changePosition(self,treeId,select,RESPONSE=None):
"""Change Postion Entry"""	"""Change Postion Entry"""
Line 563 class MPIWGRoot(ZSQLExtendFolder):	Line 569 class MPIWGRoot(ZSQLExtendFolder):
"""get project of a member"""	"""get project of a member"""
def sortP(x,y):	def sortP(x,y):
"""sort by sorting number"""	"""sort by sorting number"""
	#print x.xdata_05,y.xdata_05
return cmp(x.xdata_05,y.xdata_05)	return cmp(x.WEB_title,y.WEB_title)


ret=[]	ret=[]
Line 582 class MPIWGRoot(ZSQLExtendFolder):	Line 588 class MPIWGRoot(ZSQLExtendFolder):
proj=self.ProjectCatalog({'xdata_01':search})	proj=self.ProjectCatalog({'xdata_01':search})
if proj:	if proj:
proj2=[x for x in proj]	proj2=[x for x in proj]
proj2.sort(sortP)	# proj2.sort(sortP)
ret.append((y,proj2))	# ret.append((y,proj2))
	else:
	proj2=[]

proj=self.ProjectCatalog({'xdata_08':search})	proj=self.ProjectCatalog({'xdata_08':search})
if proj:	if proj:
proj2=[x for x in proj]	names=[x.WEB_title for x in proj]
	for x in proj:
	if not x.WEB_title in names:
	proj2.append(x)


proj2.sort(sortP)	proj2.sort(sortP)
ret.append((y,proj2))

	if len(proj2)>0:
	ret.append((y,proj2))

return ret	return ret

Line 781 class MPIWGProject(Folder):	Line 795 class MPIWGProject(Folder):
text=x.decode('latin-1').encode('utf-8')	text=x.decode('latin-1').encode('utf-8')

#delete separator (;) if is there is one	#delete separator (;) if is there is one
	## try:
	## print text, text[len(text)-1]
	## except:
	## print "error:",text
try:	try:
if text[len(text)-1]==";":	if text[len(text)-1]==";":
text=text[0:len(text)-1].encode('utf-8')	text=text[0:len(text)-1]


except:	except:
"""nothing"""	"""nothing"""

if (type(text)==StringType) or (type(text)==UnicodeType):	text2=re.sub(r';([^\s])','; \g<1>',text)
return text	return text2
else:
return text[0]


def show_html(self):	def show_html(self):
"""simple index"""	"""simple index"""
Line 904 def manage_addMPIWGProjectForm(self):	Line 921 def manage_addMPIWGProjectForm(self):
def manage_addMPIWGProject(self,id,RESPONSE=None):	def manage_addMPIWGProject(self,id,RESPONSE=None):
"""method to add a project"""	"""method to add a project"""
#print argv	#print argv
if self.REQUEST.has_key('fileupload'):	fileupload=self.REQUEST.get('fileupload',None)
fileupload=self.REQUEST['fileupload']
if fileupload:	if fileupload:
	print fileupload
file_name=fileupload.filename	file_name=fileupload.filename
filedata=fileupload.read()	filedata=fileupload.read()

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

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