rattail/appypod-rattail
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[gen] Cleaner and more robust approach when using Zope database indexes.

Browse source
This commit is contained in:
Gaetan Delannay 2012-09-04 18:00:22 +02:00
parent 5c2d94236f
commit c2eaab4b44
6 changed files with 75 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

35
gen/wrappers/ToolWrapper.py
View file

@ -168,20 +168,41 @@ class ToolWrapper(AbstractWrapper):
# reindex all Appy-managed objects, ie those in folders "config"
# and "data".
# First, clear the catalog.
self.log('Recomputing the whole catalog...')
app = self.o.getParentNode()
app.catalog._catalog.clear()
app.config.reindex()
nb = 1
failed = []
for obj in app.config.objectValues():
nb += self.refreshCatalog(startObject=obj)
subNb, subFailed = self.refreshCatalog(startObject=obj)
nb += subNb
failed += subFailed
try:
app.config.reindex()
except:
failed.append(app.config)
# Then, refresh objects in the "data" folder.
for obj in app.data.objectValues():
nb += self.refreshCatalog(startObject=obj)
print '%d object(s) were reindexed.' % nb
subNb, subFailed = self.refreshCatalog(startObject=obj)
nb += subNb
failed += subFailed
# Re-try to index all objects for which reindexation has failed.
for obj in failed: obj.reindex()
if failed:
failMsg = ' (%d retried)' % len(failed)
else:
failMsg = ''
self.log('%d object(s) were reindexed%s.' % (nb, failMsg))
else:
startObject.reindex()
nb = 1
failed = []
for obj in startObject.objectValues():
nb += self.refreshCatalog(startObject=obj)
return nb
subNb, subFailed = self.refreshCatalog(startObject=obj)
nb += subNb
failed += subFailed
try:
startObject.reindex()
except Exception, e:
failed.append(startObject)
return nb, failed
# ------------------------------------------------------------------------------