Fix indentation.
svn path=/plone.app.discussion/trunk/; revision=39322
This commit is contained in:
parent
4390b8929b
commit
318afe5aae
@ -11,36 +11,38 @@ from plone.app.discussion.conversation import ANNOTATION_KEY
|
|||||||
|
|
||||||
# security.declareProtected(ManageZCatalogEntries, 'clearFindAndRebuild')
|
# security.declareProtected(ManageZCatalogEntries, 'clearFindAndRebuild')
|
||||||
def patchedClearFindAndRebuild(self):
|
def patchedClearFindAndRebuild(self):
|
||||||
"""Empties catalog, then finds all contentish objects (i.e. objects
|
"""Empties catalog, then finds all contentish objects (i.e. objects
|
||||||
with an indexObject method), and reindexes them.
|
with an indexObject method), and reindexes them.
|
||||||
This may take a long time.
|
This may take a long time.
|
||||||
"""
|
"""
|
||||||
def indexObject(obj, path):
|
|
||||||
|
def indexObject(obj, path):
|
||||||
|
|
||||||
if (base_hasattr(obj, 'indexObject') and
|
if (base_hasattr(obj, 'indexObject') and
|
||||||
safe_callable(obj.indexObject)):
|
safe_callable(obj.indexObject)):
|
||||||
|
|
||||||
try:
|
try:
|
||||||
obj.indexObject()
|
obj.indexObject()
|
||||||
|
|
||||||
annotions = IAnnotations(obj)
|
annotions = IAnnotations(obj)
|
||||||
catalog = getToolByName(obj, 'portal_catalog', None)
|
catalog = getToolByName(obj, 'portal_catalog', None)
|
||||||
if ANNOTATION_KEY in annotions:
|
if ANNOTATION_KEY in annotions:
|
||||||
conversation = annotions[ANNOTATION_KEY]
|
conversation = annotions[ANNOTATION_KEY]
|
||||||
conversation = conversation.__of__(obj)
|
conversation = conversation.__of__(obj)
|
||||||
for comment in conversation.getComments():
|
for comment in conversation.getComments():
|
||||||
try:
|
try:
|
||||||
comment = comment.__of__(conversation)
|
comment = comment.__of__(conversation)
|
||||||
if catalog:
|
if catalog:
|
||||||
catalog.indexObject(comment)
|
catalog.indexObject(comment)
|
||||||
except StopIteration:
|
except StopIteration:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
except TypeError:
|
except TypeError:
|
||||||
# Catalogs have 'indexObject' as well, but they
|
# Catalogs have 'indexObject' as well, but they
|
||||||
# take different args, and will fail
|
# take different args, and will fail
|
||||||
pass
|
pass
|
||||||
|
|
||||||
self.manage_catalogClear()
|
self.manage_catalogClear()
|
||||||
portal = aq_parent(aq_inner(self))
|
portal = aq_parent(aq_inner(self))
|
||||||
portal.ZopeFindAndApply(portal, search_sub=True, apply_func=indexObject)
|
portal.ZopeFindAndApply(portal, search_sub=True, apply_func=indexObject)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user