--- MPIWGWeb/MPIWGProjects.py	2005/06/08 20:00:16	1.47.2.11
+++ MPIWGWeb/MPIWGProjects.py	2005/06/14 12:35:55	1.47.2.13
@@ -422,11 +422,14 @@ class MPIWGRoot(ZSQLExtendFolder):
 		return cmp(x.WEB_title[0],y.WEB_title[0])
 
 	if type(fieldContentsEntry) is StringType:
-            fieldContents=[fieldContentsEntry]
+            fieldContentsTmp=[fieldContentsEntry]
         else:
-            fieldContents=fieldContentsEntry
-            
-        projects=self.ProjectCatalog({fieldName:string.join(fieldContents,' OR')})
+            fieldContentsTmp=fieldContentsEntry
+
+        fieldContents=[]
+        for x in fieldContentsTmp:
+            fieldContents.append(" AND ".join(x.split()))
+        projects=self.ProjectCatalog({fieldName:string.join(fieldContents,' AND')})
         #print projects
 	ret=[x for x in projects]
 	ret.sort(sort)
@@ -449,11 +452,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 +666,20 @@ class MPIWGRoot(ZSQLExtendFolder):
                     ret+="""<div class="dept">\n<ul class="liste">\n"""
                 else:
                     for i in range(element[0]-actualDepth):
+                        if i>0:
+                            ret+="<li>"
                         ret+="""<ul class="liste">\n"""
-                    
+
                 actualDepth=element[0]
                 
             elif (element[0]<actualDepth):
                 #fuege soviele /ul ein wie unterschied in tiefe
                 for i in range(-element[0]+actualDepth):
-                    ret+="<br><br>\n</li>\n</ul>\n</li>\n"
+
+                    ret+="<br><br></li></ul>\n"
+
+                    #ret+="<br><br>\n</li>\n</ul>\n</li>\n"
+
 
                 if element[0]==1:
                     department=int(element[3].getContent('xdata_05'))-1
@@ -687,7 +698,7 @@ class MPIWGRoot(ZSQLExtendFolder):
             ret+="""<li>\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+="""<a href="#top"><img src="../grafik/totop.gif" vspace="10" border="0"></a><br><a name="dept%s"></a>%s: """%(department,departmentName[department])
 
@@ -1307,7 +1318,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