[Erp5-report] r18236 - /erp5/trunk/products/ERP5Type/Core/Folder.py

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Dec 11 15:15:46 2007
New Revision: 18236

URL: http://svn.erp5.org?rev=18236&view=rev
Log:
remove old comments that no longuer apply in searchFolder and countFolder. We
don't remove empty parameters before calling the catalog. The catalog decides
how to handle them.

Modified:
    erp5/trunk/products/ERP5Type/Core/Folder.py

Modified: erp5/trunk/products/ERP5Type/Core/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/Folder.py?rev=18236&r1=18235&r2=18236&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py Tue Dec 11 15:15:46 2007
@@ -277,20 +277,7 @@
     if delete_parent_uid:
       del kw['parent_uid']
 
-    # kw2 = {}
-    # I (seb) remove this because sometimes it
-    # is important to give a None parameter, like limit=None
-    # Remove useless matter before calling the
-    # catalog. In particular, consider empty
-    # strings as None values
-    #for cname in kw.keys():
-    #  if kw[cname] != '' and kw[cname] != 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.portal_catalog
-    return method(**kw)
+    return self.portal_catalog.searchResults(**kw)
 
   security.declareProtected(Permissions.View, 'countFolder')
   def countFolder(self, **kw):
@@ -323,17 +310,7 @@
     if delete_parent_uid:
       del kw['parent_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] != '' and kw[cname]!=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(**kw)
+    return self.portal_catalog.countResults(**kw)
 
   # Count objects in the folder
   security.declarePrivate('_count')