[CMF-checkins] CVS: CMF/CMFCore - PortalFolder.py:1.51.2.1

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv9212/CMFCore

Modified Files:
      Tag: yuppie-collector025-branch
	PortalFolder.py 
Log Message:
- ContentFilter now works with listCreators


=== CMF/CMFCore/PortalFolder.py 1.51 => 1.51.2.1 ===
--- CMF/CMFCore/PortalFolder.py:1.51	Sun Dec  7 15:44:05 2003
+++ CMF/CMFCore/PortalFolder.py	Fri Dec 19 09:49:42 2003
@@ -492,6 +492,7 @@
         Represent a predicate against a content object's metadata.
     """
     MARKER = []
+    filterCreator = []
     filterSubject = []
     def __init__( self
                 , Title=MARKER
@@ -515,9 +516,10 @@
                                       pat.search( x.Title() ) )
             self.description.append( 'Title: %s' % Title )
 
-        if Creator is not self.MARKER:
-            self.predicates.append( lambda x, pat=re.compile( Creator ):
-                                      pat.search( x.Creator() ) )
+        if Creator and Creator is not self.MARKER:
+            self.filterCreator = Creator
+            self.predicates.append( lambda x, creator=self.filterCreator:
+                                    creator in x.listCreators() )
             self.description.append( 'Creator: %s' % Creator )
 
         if Subject and Subject is not self.MARKER: