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

[nobody at svn.erp5.org]

Author: vincent
Date: Thu Oct 14 16:39:37 2010
New Revision: 39171

URL: http://svn.erp5.org?rev=39171&view=rev
Log:
Fix commit r39141, due to hasty rework before commit.

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=39171&r1=39170&r2=39171&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] Thu Oct 14 16:39:37 2010
@@ -101,12 +101,15 @@ except ImportError:
   def getTransactionalVariable():
     return {}
 
-def generateCatalogCacheId(method_id, self, *args, **kwd):
-  # XXX: getPath is overkill for a unique cache identifier.
+def getInstanceID(instance):
+  # XXX: getPhysicalPath is overkill for a unique cache identifier.
   # What I would like to use instead of it is:
   #   (self._p_jar.db().database_name, self._p_oid)
   # but database_name is not unique in at least ZODB 3.4 (Zope 2.8.8).
-  return str((method_id, self.getCacheSequenceNumber(), self.getPath(),
+  return instance.getPhysicalPath()
+
+def generateCatalogCacheId(method_id, self, *args, **kwd):
+  return str((method_id, self.getCacheSequenceNumber(), getInstanceID(self),
     args, kwd))
 
 class transactional_cache_decorator: