Commit 7e32a53e authored by Michel Pelletier's avatar Michel Pelletier

Fixed reindexing bug

Seems to be quite usable at this point.
parent 12a4e8aa
...@@ -332,7 +332,10 @@ class Catalog(Persistent, Acquisition.Implicit): ...@@ -332,7 +332,10 @@ class Catalog(Persistent, Acquisition.Implicit):
for x in self.indexes.values(): for x in self.indexes.values():
if hasattr(x, 'unindex_object'): if hasattr(x, 'unindex_object'):
try:
x.unindex_object(rid) x.unindex_object(rid)
except KeyError:
pass #fugedaboudit
del self.data[rid] del self.data[rid]
del self.uids[uid] del self.uids[uid]
......
...@@ -137,12 +137,21 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit): ...@@ -137,12 +137,21 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit):
('Manage ZCatalog Entries', ('Manage ZCatalog Entries',
['manage_catalogObject', 'manage_uncatalogObject', ['manage_catalogObject', 'manage_uncatalogObject',
'catalog_object', 'uncatalog_object',
'manage_catalogView', 'manage_catalogFind', 'manage_catalogView', 'manage_catalogFind',
'manage_catalogFindResults', 'manage_main'], 'manage_catalogSchema', 'manage_catalogIndexes',
'manage_catalogStatus',
'manage_catalogReindex', 'manage_catalogFoundItems',
'manage_catalogClear', 'manage_addColumn', 'manage_delColumns',
'manage_addIndex', 'manage_delIndexs', 'manage_main',],
['Manager']), ['Manager']),
('Search ZCatalog', ('Search ZCatalog',
['searchResults','__call__'], ['searchResults', '__call__', 'uniqueValuesFor',
'getpath', 'schema', 'indexes', 'index_objects',
'all_meta_types', 'valid_roles', 'resolve_url',],
['Anonymous', 'Manager']), ['Anonymous', 'Manager']),
) )
...@@ -228,7 +237,7 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit): ...@@ -228,7 +237,7 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit):
references and refreshing objects""" references and refreshing objects"""
items = tuple(self._catalog.uids.items()) items = tuple(self._catalog.uids.items())
self._catalog.clear() # self._catalog.clear()
for path, i in items: for path, i in items:
try: try:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment