aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancis <francis>2008-04-30 10:58:21 +0000
committerfrancis <francis>2008-04-30 10:58:21 +0000
commitb37cf5e736deb2111f103e20109bd9ebbf0be7d6 (patch)
tree0a8e28b27f3c6c6fc35c5a90fc717b3d94c569b1
parent4a8939ab12a9f5be819d314f22b4a9989b025640 (diff)
Reopen db each time
-rw-r--r--vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
index 6ded61690..8b82620b2 100644
--- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
+++ b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
@@ -4,7 +4,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: acts_as_xapian.rb,v 1.17 2008-04-30 08:12:59 francis Exp $
+# $Id: acts_as_xapian.rb,v 1.18 2008-04-30 10:58:21 francis Exp $
# TODO:
# Test :eager_load
@@ -208,15 +208,15 @@ module ActsAsXapian
@@stemmer = Xapian::Stem.new('english')
end
- # Called only when we *need* to open the db
+ # Opens / reopens the db for reading
+ # XXX we perhaps don't need to rebuild database and enquire and queryparser -
+ # but db.reopen wasn't enough by itself, so just do everything it's easier.
def ActsAsXapian.readable_init
- if @@db.nil?
- # basic Xapian objects
- @@db = Xapian::Database.new(@@db_path)
- @@enquire = Xapian::Enquire.new(@@db)
+ # basic Xapian objects
+ @@db = Xapian::Database.new(@@db_path)
+ @@enquire = Xapian::Enquire.new(@@db)
- init_query_parser
- end
+ init_query_parser
end
# Make a new query parser