Skip to content

Commit

Permalink
Fixed reindexing bug
Browse files Browse the repository at this point in the history
Seems to be quite usable at this point.
  • Loading branch information
Michel Pelletier committed Jul 2, 1999
1 parent 08649da commit c2aaee3
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
5 changes: 4 additions & 1 deletion Catalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,10 @@ def uncatalogObject(self, uid):

for x in self.indexes.values():
if hasattr(x, 'unindex_object'):
x.unindex_object(rid)
try:
x.unindex_object(rid)
except KeyError:
pass #fugedaboudit

del self.data[rid]
del self.uids[uid]
Expand Down
17 changes: 13 additions & 4 deletions ZCatalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,22 @@ class ZCatalog(Folder, FindSupport, Persistent, Implicit):
__ac_permissions__=(

('Manage ZCatalog Entries',
['manage_catalogObject', 'manage_uncatalogObject',
['manage_catalogObject', 'manage_uncatalogObject',
'catalog_object', 'uncatalog_object',

'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']),

('Search ZCatalog',
['searchResults','__call__'],
['searchResults', '__call__', 'uniqueValuesFor',
'getpath', 'schema', 'indexes', 'index_objects',
'all_meta_types', 'valid_roles', 'resolve_url',],
['Anonymous', 'Manager']),
)

Expand Down Expand Up @@ -228,7 +237,7 @@ def manage_catalogReindex(self, REQUEST):
references and refreshing objects"""
items = tuple(self._catalog.uids.items())

self._catalog.clear()
# self._catalog.clear()

for path, i in items:
try:
Expand Down

0 comments on commit c2aaee3

Please sign in to comment.