explicitly load index version, for better error messages

[sup] / lib / sup / index.rb

diff --git a/lib/sup/index.rb b/lib/sup/index.rb
index 9ec0488502faef01312b5580d94495b3ca60d114..fb46eb053a02b871923e93281021441414e11683 100644 (file)
--- a/lib/sup/index.rb
+++ b/lib/sup/index.rb
@@ -213,10 +213,10 @@ EOS
 end
 
 index_name = ENV['SUP_INDEX'] || $config[:index] || DEFAULT_INDEX
-begin
-  require "sup/#{index_name}_index"
-rescue LoadError
-  fail "invalid index name #{index_name.inspect}"
+case index_name
+  when "xapian"; require "sup/xapian_index"
+  when "ferret"; require "sup/ferret_index"
+  else fail "unknown index type #{index_name.inspect}"
 end
 Index = Redwood.const_get "#{index_name.capitalize}Index"
 Redwood::log "using index #{Index.name}"