[Checkins] SVN: Products.CMFCore/branches/rossp-intid/Products/CMFCore/ Support the Products.ZCatalog intid branch, means no more uid arg
Ross Patterson
me at rpatterson.net
Wed Nov 2 19:43:29 UTC 2011
Log message for revision 123259:
Support the Products.ZCatalog intid branch, means no more uid arg
Changed:
U Products.CMFCore/branches/rossp-intid/Products/CMFCore/CMFCatalogAware.py
U Products.CMFCore/branches/rossp-intid/Products/CMFCore/CatalogTool.py
U Products.CMFCore/branches/rossp-intid/Products/CMFCore/tests/test_CMFCatalogAware.py
U Products.CMFCore/branches/rossp-intid/Products/CMFCore/tests/test_CatalogTool.py
-=-
Modified: Products.CMFCore/branches/rossp-intid/Products/CMFCore/CMFCatalogAware.py
===================================================================
--- Products.CMFCore/branches/rossp-intid/Products/CMFCore/CMFCatalogAware.py 2011-11-02 18:44:16 UTC (rev 123258)
+++ Products.CMFCore/branches/rossp-intid/Products/CMFCore/CMFCatalogAware.py 2011-11-02 19:43:28 UTC (rev 123259)
@@ -116,7 +116,7 @@
# Recatalog with the same catalog uid.
s = getattr(ob, '_p_changed', 0)
catalog.reindexObject(ob, idxs=self._cmf_security_indexes,
- update_metadata=0, uid=brain_path)
+ update_metadata=0)
if s is None: ob._p_deactivate()
InitializeClass(CatalogAware)
Modified: Products.CMFCore/branches/rossp-intid/Products/CMFCore/CatalogTool.py
===================================================================
--- Products.CMFCore/branches/rossp-intid/Products/CMFCore/CatalogTool.py 2011-11-02 18:44:16 UTC (rev 123258)
+++ Products.CMFCore/branches/rossp-intid/Products/CMFCore/CatalogTool.py 2011-11-02 19:43:28 UTC (rev 123259)
@@ -249,7 +249,7 @@
manage_catalogFind = DTMLFile( 'catalogFind', _dtmldir )
- def catalog_object(self, obj, uid=None, idxs=None, update_metadata=1,
+ def catalog_object(self, obj, idxs=None, update_metadata=1,
pghandler=None):
# Wraps the object with workflow and accessibility
# information just before cataloging.
@@ -262,7 +262,7 @@
if w is None:
# BBB
w = IndexableObjectWrapper(obj, self)
- ZCatalog.catalog_object(self, w, uid, idxs, update_metadata,
+ ZCatalog.catalog_object(self, w, idxs, update_metadata,
pghandler)
security.declarePrivate('indexObject')
@@ -280,7 +280,7 @@
self.uncatalog_object(url)
security.declarePrivate('reindexObject')
- def reindexObject(self, object, idxs=[], update_metadata=1, uid=None):
+ def reindexObject(self, object, idxs=[], update_metadata=1):
"""Update catalog after object data has changed.
The optional idxs argument is a list of specific indexes
@@ -288,16 +288,11 @@
The update_metadata flag controls whether the object's
metadata record is updated as well.
-
- If a non-None uid is passed, it will be used as the catalog uid
- for the object instead of its physical path.
"""
- if uid is None:
- uid = self.__url(object)
if idxs != []:
# Filter out invalid indexes.
valid_indexes = self._catalog.indexes.keys()
idxs = [i for i in idxs if i in valid_indexes]
- self.catalog_object(object, uid, idxs, update_metadata)
+ self.catalog_object(object, idxs, update_metadata)
InitializeClass(CatalogTool)
Modified: Products.CMFCore/branches/rossp-intid/Products/CMFCore/tests/test_CMFCatalogAware.py
===================================================================
--- Products.CMFCore/branches/rossp-intid/Products/CMFCore/tests/test_CMFCatalogAware.py 2011-11-02 18:44:16 UTC (rev 123258)
+++ Products.CMFCore/branches/rossp-intid/Products/CMFCore/tests/test_CMFCatalogAware.py 2011-11-02 19:43:28 UTC (rev 123259)
@@ -76,7 +76,7 @@
self.obs = []
def indexObject(self, ob):
self.log.append('index %s' % physicalpath(ob))
- def reindexObject(self, ob, idxs=[], update_metadata=0, uid=None):
+ def reindexObject(self, ob, idxs=[], update_metadata=0):
self.log.append('reindex %s %s' % (physicalpath(ob), idxs))
def unindexObject(self, ob):
self.log.append('unindex %s' % physicalpath(ob))
Modified: Products.CMFCore/branches/rossp-intid/Products/CMFCore/tests/test_CatalogTool.py
===================================================================
--- Products.CMFCore/branches/rossp-intid/Products/CMFCore/tests/test_CatalogTool.py 2011-11-02 18:44:16 UTC (rev 123258)
+++ Products.CMFCore/branches/rossp-intid/Products/CMFCore/tests/test_CatalogTool.py 2011-11-02 19:43:28 UTC (rev 123259)
@@ -17,6 +17,7 @@
from Acquisition import Implicit
from zope.interface import implements
+from Products.ZCatalog import testing
from Products.CMFCore.interfaces import ICatalogTool
from Products.CMFCore.tests.base.dummy import DummyContent
from Products.CMFCore.interfaces import IIndexableObject
@@ -125,6 +126,8 @@
class CatalogToolTests(SecurityTest):
+ layer = testing.layer
+
def _getTargetClass(self):
from Products.CMFCore.CatalogTool import CatalogTool
@@ -174,15 +177,15 @@
tool.addIndex('SearchableText', 'KeywordIndex')
dummy = self._makeContent(catalog=1)
- tool.catalog_object(dummy, '/dummy')
- tool.catalog_object(dummy, '/dummy', ['SearchableText'])
+ tool.catalog_object(dummy)
+ tool.catalog_object(dummy, ['SearchableText'])
def test_search_anonymous(self):
catalog = self._makeOne()
catalog.addIndex('allowedRolesAndUsers', 'KeywordIndex')
catalog.addIndex('meta_type', 'FieldIndex')
dummy = self._makeContent(catalog=1)
- catalog.catalog_object(dummy, '/dummy')
+ catalog.catalog_object(dummy)
query = {'meta_type': 'Dummy'}
self.assertEqual(1, len(catalog._catalog.searchResults(query)))
@@ -194,7 +197,7 @@
catalog.addIndex('meta_type', 'FieldIndex')
dummy = self._makeContent(catalog=1)
dummy.allowedRolesAndUsers = ('Blob', )
- catalog.catalog_object(dummy, '/dummy')
+ catalog.catalog_object(dummy)
self.loginWithRoles('Blob')
@@ -208,7 +211,7 @@
catalog.addIndex('meta_type', 'FieldIndex')
dummy = self._makeContent(catalog=1)
dummy.allowedRolesAndUsers = ('Blob', )
- catalog.catalog_object(dummy, '/dummy')
+ catalog.catalog_object(dummy)
self.loginWithRoles('Blob')
self.setupProxyRoles('Waggle')
@@ -223,7 +226,7 @@
catalog.addIndex('meta_type', 'FieldIndex')
dummy = self._makeContent(catalog=1)
dummy.allowedRoleAndUsers = ('Blob', )
- catalog.catalog_object(dummy, '/dummy')
+ catalog.catalog_object(dummy)
self.loginWithRoles('Waggle')
@@ -237,7 +240,7 @@
catalog.addIndex('meta_type', 'FieldIndex')
dummy = self._makeContent(catalog=1)
dummy.allowedRolesAndUsers = ('Blob', )
- catalog.catalog_object(dummy, '/dummy')
+ catalog.catalog_object(dummy)
self.loginWithRoles('Waggle')
self.setupProxyRoles('Blob')
@@ -262,7 +265,7 @@
# not yet effective
dummy.effective = now+1
dummy.expires = now+2
- catalog.catalog_object(dummy, '/dummy')
+ catalog.catalog_object(dummy)
query = {'meta_type': 'Dummy'}
self.assertEqual(1, len(catalog._catalog.searchResults(query)))
self.assertEqual(0, len(catalog.searchResults(query)))
@@ -270,7 +273,7 @@
# already expired
dummy.effective = now-2
dummy.expires = now-1
- catalog.catalog_object(dummy, '/dummy')
+ catalog.catalog_object(dummy)
self.assertEqual(1, len(catalog._catalog.searchResults(query)))
self.assertEqual(0, len(catalog.searchResults(query)))
@@ -289,7 +292,7 @@
# already expired
dummy.effective = now-4
dummy.expires = now-2
- catalog.catalog_object(dummy, '/dummy')
+ catalog.catalog_object(dummy)
query = {'meta_type': 'Dummy'}
self.assertEqual(1, len(catalog._catalog.searchResults(query)))
self.assertEqual(1, len(catalog.searchResults(query)))
@@ -327,7 +330,7 @@
# already expired
dummy.effective = now-4
dummy.expires = now-2
- catalog.catalog_object(dummy, '/dummy')
+ catalog.catalog_object(dummy)
query = {'meta_type': 'Dummy'}
self.assertEqual(1, len(catalog._catalog.searchResults(query)))
self.assertEqual(0, len(catalog.searchResults(query)))
@@ -363,7 +366,7 @@
# visible
dummy.effective = now-2
dummy.expires = now+2
- catalog.catalog_object(dummy, '/dummy')
+ catalog.catalog_object(dummy)
query = {'meta_type': 'Dummy'}
self.assertEqual(1, len(catalog._catalog.searchResults(query)))
self.assertEqual(1, len(catalog.searchResults(query)))
@@ -464,7 +467,7 @@
site._setObject('portal_catalog', self._makeOne())
ctool = site.portal_catalog
ctool.addIndex('meta_type', 'FieldIndex')
- ctool.catalog_object(site.dummy, '/dummy')
+ ctool.catalog_object(site.dummy)
query = {'meta_type': 'Dummy'}
self.assertEqual(1, len(ctool._catalog.searchResults(query)))
@@ -513,7 +516,7 @@
dummy = self._makeContent(catalog=1)
ctool = self._makeOne()
ctool.addIndex('meta_type', 'FieldIndex')
- ctool.catalog_object(dummy, '/dummy')
+ ctool.catalog_object(dummy)
query = {'meta_type': 'Dummy'}
self.assertEqual(1, len(ctool._catalog.searchResults(query)))
@@ -524,7 +527,7 @@
dummy = DummyContent(catalog=1)
ctool = self._makeOne()
ctool.addIndex('meta_type', 'FieldIndex')
- ctool.catalog_object(dummy, '/dummy')
+ ctool.catalog_object(dummy)
query = {'meta_type': 'Dummy'}
self.assertEqual(1, len(ctool._catalog.searchResults(query)))
@@ -544,7 +547,7 @@
dummy = DummyContent(catalog=1)
ctool = self._makeOne()
ctool.addIndex('meta_type', 'FieldIndex')
- ctool.catalog_object(dummy, '/dummy')
+ ctool.catalog_object(dummy)
query = {'meta_type': 'Dummy'}
self.assertEqual(1, len(ctool._catalog.searchResults(query)))
More information about the checkins
mailing list