From 0fcea34df90d4e85e452a44daecb75bc876f41b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Tue, 11 Dec 2007 14:15:46 +0000
Subject: [PATCH] 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.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18236 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5Type/Core/Folder.py | 27 ++-------------------------
1 file changed, 2 insertions(+), 25 deletions(-)
diff --git a/product/ERP5Type/Core/Folder.py b/product/ERP5Type/Core/Folder.py
index e5c5beb4f4..479da78874 100644
--- a/product/ERP5Type/Core/Folder.py
+++ b/product/ERP5Type/Core/Folder.py
@@ -277,20 +277,7 @@ class FolderMixIn(ExtensionClass.Base):
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 @@ class FolderMixIn(ExtensionClass.Base):
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')
--
2.30.9