[Erp5-report] r18234 - /erp5/trunk/products/ERP5/ERP5Site.py

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Dec 11 15:11:08 2007
New Revision: 18234

URL: http://svn.erp5.org?rev=18234&view=rev
Log:
synchronize ERP5Site.searchFolder implementation with ERP5Type.Core.Folder.searchFolder 

Modified:
    erp5/trunk/products/ERP5/ERP5Site.py

Modified: erp5/trunk/products/ERP5/ERP5Site.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/ERP5Site.py?rev=18234&r1=18233&r2=18234&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/ERP5Site.py (original)
+++ erp5/trunk/products/ERP5/ERP5Site.py Tue Dec 11 15:11:08 2007
@@ -339,17 +339,7 @@
     """
     if not kw.has_key('parent_uid'):
       kw['parent_uid'] = self.uid
-    kw2 = {}
-    # Remove useless matter before calling the
-    # catalog. In particular, consider empty
-    # strings as None values
-    for cname in kw.keys():
-      if kw[cname] not in ('', None):
-        kw2[cname] = kw[cname]
-    # The method to call to search the folder
-    # content has to be called z_search_folder
-    method = self.portal_catalog.searchResults
-    return method(**kw2)
+    return self.portal_catalog.searchResults(**kw)
 
   security.declareProtected(Permissions.AccessContentsInformation, 'countFolder')
   def countFolder(self, **kw):
@@ -359,17 +349,7 @@
     """
     if not kw.has_key('parent_uid'):
       kw['parent_uid'] = self.uid
-    kw2 = {}
-    # Remove useless matter before calling the
-    # catalog. In particular, consider empty
-    # strings as None values
-    for cname in kw.keys():
-      if kw[cname] not in ('', None):
-        kw2[cname] = kw[cname]
-    # The method to call to search the folder
-    # content has to be called z_search_folder
-    method = self.portal_catalog.countResults
-    return method(**kw2)
+    return self.portal_catalog.countResults(**kw)
 
   # Proxy methods for security reasons
   def getOwnerInfo(self):