aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancis <francis>2008-08-19 12:38:34 +0000
committerfrancis <francis>2008-08-19 12:38:34 +0000
commit8bb1faa5ca938b8104fb392fd0673d787ba53bf1 (patch)
tree860ebc59a0078f3a307aca7864e4b8020b12d8b5
parentd49f74b3a4e0880cbe5b887f7baaf8564232dada (diff)
From git
-rw-r--r--vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb2
1 files changed, 2 insertions, 0 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 55661ef89..b23b3881a 100644
--- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
+++ b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
@@ -36,6 +36,7 @@ module ActsAsXapian
# XXX global class intializers here get loaded more than once, don't know why. Protect them.
if not $acts_as_xapian_class_var_init
@@db = nil
+ @@db_path = nil
@@writable_db = nil
@@writable_suffix = nil
@@init_values = []
@@ -87,6 +88,7 @@ module ActsAsXapian
# but db.reopen wasn't enough by itself, so just do everything it's easier.
def ActsAsXapian.readable_init
raise NoXapianRubyBindingsError.new("Xapian Ruby bindings not installed") unless ActsAsXapian.bindings_available
+ raise "acts_as_xapian hasn't been called in any models" unless @@db_path
# basic Xapian objects
begin