[Erp5-report] r11328 - /erp5/trunk/products/ZSQLCatalog/SQLCatalog.py

[nobody at svn.erp5.org]

Author: seb
Date: Wed Nov 15 17:47:49 2006
New Revision: 11328

URL: http://svn.erp5.org?rev=11328&view=rev
Log:
support uid parameter in uncatalogObject

Modified:
    erp5/trunk/products/ZSQLCatalog/SQLCatalog.py

Modified: erp5/trunk/products/ZSQLCatalog/SQLCatalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/SQLCatalog.py?rev=11328&r1=11327&r2=11328&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py Wed Nov 15 17:47:49 2006
@@ -1192,7 +1192,7 @@
 
   if psyco is not None: psyco.bind(catalogObjectList)
 
-  def uncatalogObject(self, path):
+  def uncatalogObject(self, path=None,uid=None):
     """
     Uncatalog and object from the Catalog.
 
@@ -1217,7 +1217,8 @@
     if not (root_indexable and site_indexable):
       return None
 
-    uid = self.getUidForPath(path)
+    if uid is None and path is not None:
+      uid = self.getUidForPath(path)
     methods = self.sql_uncatalog_object
     if uid is None:
       return None