--- MPIWGWeb/MPIWGProjects.py 2005/06/08 20:13:17 1.47.2.12 +++ 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)