--- MPIWGWeb/MPIWGProjects.py 2005/06/08 20:00:16 1.47.2.11
+++ MPIWGWeb/MPIWGProjects.py 2005/06/08 20:13:17 1.47.2.12
@@ -449,11 +449,13 @@ class MPIWGRoot(ZSQLExtendFolder):
def getDisciplineList(self):
"""get disciplines as list"""
- return self.disciplineList.split("\n")
+ list= self.disciplineList.split("\n")
+ return [x.rstrip().lstrip() for x in list]
def getThemeList(self):
"""get themes as list"""
- return self.themesList.split("\n")
+ list= self.themesList.split("\n")
+ return [x.rstrip().lstrip() for x in list]
def test(self):
"""test"""
@@ -661,14 +663,20 @@ class MPIWGRoot(ZSQLExtendFolder):
ret+="""
\n
\n"""
else:
for i in range(element[0]-actualDepth):
+ if i>0:
+ ret+="- "
ret+="""
\n"""
-
+
actualDepth=element[0]
elif (element[0]
\n
\n
\n\n"
+
+ ret+="
\n"
+
+ #ret+="
\n\n\n\n"
+
if element[0]==1:
department=int(element[3].getContent('xdata_05'))-1
@@ -687,7 +695,7 @@ class MPIWGRoot(ZSQLExtendFolder):
ret+="""
\n"""
if actualDepth==1:
- departmentName={'1':'Department I','2':'Department II','3':'Department III', '4':'NWG','5':'NWG'}
+ departmentName={'1':'Department I','2':'Department II','3':'Department III', '4':'Ind. Research Group','5':'Ind. Research Group'}
department=element[3].getContent('xdata_05')
ret+="""
%s: """%(department,departmentName[department])
@@ -1307,7 +1315,8 @@ class MPIWGProject(CatalogAware,Folder):
else:
splitted=list[0].split(";")
-
+ splitted=[y.rstrip().lstrip() for y in splitted]
+
for x in splitted:
if (not x==u'') and x in wert:
return 1