--- MPIWGWeb/MPIWGProjects.py 2004/07/08 11:42:31 1.14 +++ MPIWGWeb/MPIWGProjects.py 2004/07/29 08:18:10 1.16 @@ -420,6 +420,17 @@ class MPIWGRoot(ZSQLExtendFolder): return returnList + def formatElementForOverview(self,element): + """format the element for output in overview""" + if element[0]==1: #department + return "

Department %s: %s

"%(element[3].getContent('xdata_05'),element[3].getContent('WEB_title')) + + elif element[0]==2: #mainprojects + return "

%s

"%(element[3].getContent('WEB_title')) + + elif element[0]==3: + return "
%s"%(element[3].getContent('WEB_title')) + def changePosition(self,treeId,select,RESPONSE=None): """Change Postion Entry""" numbers=[] @@ -478,6 +489,35 @@ 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("%s"%(proj[0].absolute_url,person.encode('utf-8'))) + ret.append("%s"%('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): @@ -746,8 +786,11 @@ class MPIWGProject(Folder): text=text[0:len(text)-1].encode('utf-8') except: """nothing""" - - return text + + if (type(text)==StringType) or (type(text)==UnicodeType): + return text + else: + return text[0] def show_html(self):