Hopiu/xapian-haystack
1
0
Fork 0
mirror of https://github.com/Hopiu/xapian-haystack.git synced 2026-05-01 03:54:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't open a writable database in clear method if we're going to rmtree. Only do so when required. Should fix issue GH-96.

Browse source
This commit is contained in:
David Sauve 2012-06-05 09:57:24 -07:00
parent a4281e7cbd
commit 37add92bc4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xapian_backend.py
View file

@ -303,7 +303,6 @@ class XapianSearchBackend(BaseSearchBackend):
the term `XCONTENTTYPE<app_name>.<model_name>`. This will delete
all documents with the specified model type.
"""
database = self._database(writable=True)
if not models:
# Because there does not appear to be a "clear all" method,
# it's much quicker to remove the contents of the `self.path`
@ -311,12 +310,13 @@ class XapianSearchBackend(BaseSearchBackend):
if os.path.exists(self.path):
shutil.rmtree(self.path)
else:
database = self._database(writable=True)
for model in models:
database.delete_document(
DOCUMENT_CT_TERM_PREFIX + '%s.%s' %
(model._meta.app_label, model._meta.module_name)
)
database.close()
database.close()
def document_count(self):
try: