[Erp5-report] r16225 - /erp5/trunk/products/ERP5Catalog/CatalogTool.py

[nobody at svn.erp5.org]

Author: vincent
Date: Mon Sep 10 16:10:16 2007
New Revision: 16225

URL: http://svn.erp5.org?rev=16225&view=rev
Log:
It is valid to unindex an object without providing it (eg, an object is indexed but does not exist any more), so make "object" parameter optionnal.
Add a test to check that at least one way to find an object to unindex is given.

Modified:
    erp5/trunk/products/ERP5Catalog/CatalogTool.py

Modified: erp5/trunk/products/ERP5Catalog/CatalogTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/CatalogTool.py?rev=16225&r1=16224&r2=16225&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/CatalogTool.py (original)
+++ erp5/trunk/products/ERP5Catalog/CatalogTool.py Mon Sep 10 16:10:16 2007
@@ -711,10 +711,12 @@
 
 
     security.declarePrivate('unindexObject')
-    def unindexObject(self, object, path=None, uid=None,sql_catalog_id=None):
+    def unindexObject(self, object=None, path=None, uid=None,sql_catalog_id=None):
         """
           Remove from catalog.
         """
+        if path is None and uid is None and object is None:
+          raise TypeError, 'One of uid, path and object parameters must not be None'
         if path is None and uid is None:
           path = self.__url(object)
         self.uncatalog_object(path=path,uid=uid, sql_catalog_id=sql_catalog_id)