Move acts_as_xapian out of vendor/plugins

This includes making making sure that xapiandbs directory is moved
with this version of the code.

10 files changed, 0 insertions, 1382 deletions

diff --git a/vendor/plugins/acts_as_xapian/.cvsignore b/vendor/plugins/acts_as_xapian/.cvsignore
deleted file mode 100644
index 6379fb207..000000000
--- a/vendor/plugins/acts_as_xapian/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-xapiandbs
-.git
diff --git a/vendor/plugins/acts_as_xapian/.gitignore b/vendor/plugins/acts_as_xapian/.gitignore
deleted file mode 100644
index 60e95666f..000000000
--- a/vendor/plugins/acts_as_xapian/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/xapiandbs
-CVS
-*.swp
diff --git a/vendor/plugins/acts_as_xapian/LICENSE.txt b/vendor/plugins/acts_as_xapian/LICENSE.txt
deleted file mode 100644
index 72d93c4be..000000000
--- a/vendor/plugins/acts_as_xapian/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-acts_as_xapian is released under the MIT License.
-
-Copyright (c) 2008 UK Citizens Online Democracy.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the acts_as_xapian software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including without
-limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/plugins/acts_as_xapian/README.txt b/vendor/plugins/acts_as_xapian/README.txt
deleted file mode 100644
index a1d22ef3f..000000000
--- a/vendor/plugins/acts_as_xapian/README.txt
+++ /dev/null
@@ -1,276 +0,0 @@
-The official page for acts_as_xapian is now the Google Groups page.
-
-http://groups.google.com/group/acts_as_xapian
-
-frabcus's github repository is no longer the official repository,
-find the official one from the Google Groups page.
-
-------------------------------------------------------------------------
-
-Do patch this file if there is documentation missing / wrong. It's called
-README.txt and is in git, using Textile formatting. The wiki page is just
-copied from the README.txt file.
-
-Contents
-========
-
-* a. Introduction to acts_as_xapian
-* b. Installation
-* c. Comparison to acts_as_solr (as on 24 April 2008)
-* d. Documentation - indexing
-* e. Documentation - querying
-* f. Configuration
-* g. Performance
-* h. Support
-
-
-a. Introduction to acts_as_xapian
-=================================
-
-"Xapian":http://www.xapian.org is a full text search engine library which has
-Ruby bindings. acts_as_xapian adds support for it to Rails. It is an
-alternative to acts_as_solr, acts_as_ferret, Ultrasphinx, acts_as_indexed,
-acts_as_searchable or acts_as_tsearch.
-
-acts_as_xapian is deployed in production on these websites.
-* "WhatDoTheyKnow":http://www.whatdotheyknow.com
-* "MindBites":http://www.mindbites.com
-
-The section "c. Comparison to acts_as_solr" below will give you an idea of
-acts_as_xapian's features.
-
-acts_as_xapian was started by Francis Irving in May 2008 for search and email
-alerts in WhatDoTheyKnow, and so was supported by "mySociety":http://www.mysociety.org
-and initially paid for by the "JRSST Charitable Trust":http://www.jrrt.org.uk/jrsstct.htm
-
-
-b. Installation
-===============
-
-Retrieve the plugin directly from the git version control system by running
-this command within your Rails app.
-
-    git clone git://github.com/frabcus/acts_as_xapian.git vendor/plugins/acts_as_xapian
-
-Xapian 1.0.5 and associated Ruby bindings are also required.
-
-Debian or Ubuntu - install the packages libxapian15 and libxapian-ruby1.8.
-
-Mac OSX - follow the instructions for installing from source on
-the "Installing Xapian":http://xapian.org/docs/install.html page - you need the
-Xapian library and bindings (you don't need Omega).
-
-There is no Ruby Gem for Xapian, it would be great if you could make one!
-
-
-c. Comparison to acts_as_solr (as on 24 April 2008)
-=============================
-
-* Offline indexing only mode - which is a minus if you want changes
-immediately reflected in the search index, and a plus if you were going to
-have to implement your own offline indexing anyway.
-
-* Collapsing - the equivalent of SQL's "group by". You can specify a field
-to collapse on, and only the most relevant result from each value of that
-field is returned. Along with a count of how many there are in total.
-acts_as_solr doesn't have this.
-
-* No highlighting - Xapian can't return you text highlighted with a search
-query. You can try and make do with TextHelper::highlight (combined with
-words_to_highlight below). I found the highlighting in acts_as_solr didn't
-really understand the query anyway.
-
-* Date range searching - this exists in acts_as_solr, but I found it
-wasn't documented well enough, and was hard to get working.
-
-* Spelling correction - "did you mean?" built in and just works.
-
-* Similar documents - acts_as_xapian has a simple command to find other models
-that are like a specified model.
-
-* Multiple models - acts_as_xapian searches multiple types of model if you
-like, returning them mixed up together by relevancy. This is like
-multi_solr_search, only it is the default mode of operation and is properly
-supported.
-
-* No daemons - However, if you have more than one web server, you'll need to
-work out how to use "Xapian's remote backend":http://xapian.org/docs/remote.html.
-
-* One layer - full-powered Xapian is called directly from the Ruby, without
-Solr getting in the way whenever you want to use a new feature from Lucene.
-
-* No Java - an advantage if you're more used to working in the rest of the
-open source world. acts_as_xapian, it's pure Ruby and C++.
-
-* Xapian's awesome email list - the kids over at
-"xapian-discuss":http://lists.xapian.org/mailman/listinfo/xapian-discuss
-are super helpful. Useful if you need to extend and improve acts_as_xapian. The
-Ruby bindings are mature and well maintained as part of Xapian.
-
-
-d. Documentation - indexing
-===========================
-
-Xapian is an *offline indexing* search library - only one process can have the
-Xapian database open for writing at once, and others that try meanwhile are
-unceremoniously kicked out. For this reason, acts_as_xapian does not support
-immediate writing to the database when your models change.
-
-Instead, there is a ActsAsXapianJob model which stores which models need
-updating or deleting in the search index. A rake task 'xapian:update_index'
-then performs the updates since last change. You can run it on a cron job, or
-similar.
-
-Here's how to add indexing to your Rails app:
-
-1. Put acts_as_xapian in your models that need search indexing. e.g.
-
-    acts_as_xapian :texts => [ :name, :short_name ],
-       :values => [ [ :created_at, 0, "created_at", :date ] ],
-       :terms => [ [ :variety, 'V', "variety" ] ]
-
-Options must include:
-
-* :texts, an array of fields for indexing with full text search.
-e.g. :texts => [ :title, :body ]
-
-* :values, things which have a range of values for sorting, or for collapsing.
-Specify an array quadruple of [ field, identifier, prefix, type ] where
-** identifier is an arbitary numeric identifier for use in the Xapian database
-** prefix is the part to use in search queries that goes before the :
-** type can be any of :string, :number or :date
-
-e.g. :values => [ [ :created_at, 0, "created_at", :date ],
-[ :size, 1, "size", :string ] ]
-
-* :terms, things which come with a prefix (before a :) in search queries.
-Specify an array triple of [ field, char, prefix ] where
-** char is an arbitary single upper case char used in the Xapian database, just
-pick any single uppercase character, but use a different one for each prefix.
-** prefix is the part to use in search queries that goes before the :
-For example, if you were making Google and indexing to be able to later do a
-query like "site:www.whatdotheyknow.com", then the prefix would be "site".
-
-e.g. :terms => [ [ :variety, 'V', "variety" ] ]
-
-A 'field' is a symbol referring to either an attribute or a function which
-returns the text, date or number to index. Both 'identifier' and 'char' must be
-the same for the same prefix in different models.
-
-Options may include:
-* :eager_load, added as an :include clause when looking up search results in
-database
-* :if, either an attribute or a function which if returns false means the
-object isn't indexed
-
-2. Generate a database migration to create the ActsAsXapianJob model:
-
-    script/generate acts_as_xapian
-    rake db:migrate
-
-3. Call 'rake xapian:rebuild_index models="ModelName1 ModelName2"' to build the index
-the first time (you must specify all your indexed models). It's put in a
-development/test/production dir in acts_as_xapian/xapiandbs. See f. Configuration
-below if you want to change this.
-
-4. Then from a cron job or a daemon, or by hand regularly!, call 'rake xapian:update_index'
-
-
-e. Documentation - querying
-===========================
-
-Testing indexing
-----------------
-
-If you just want to test indexing is working, you'll find this rake task
-useful (it has more options, see tasks/xapian.rake)
-
-    rake xapian:query models="PublicBody User" query="moo"
-
-Performing a query
-------------------
-
-To perform a query from code call ActsAsXapian::Search.new. This takes in turn:
-* model_classes - list of models to search, e.g. [PublicBody, InfoRequestEvent]
-* query_string - Google like syntax, see below
-
-And then a hash of options:
-* :offset - Offset of first result (default 0)
-* :limit - Number of results per page
-* :sort_by_prefix - Optionally, prefix of value to sort by, otherwise sort by relevance
-* :sort_by_ascending - Default true (documents with higher values better/earlier), set to false for descending sort
-* :collapse_by_prefix - Optionally, prefix of value to collapse by (i.e. only return most relevant result from group)
-
-Google like query syntax is as described in
-    "Xapian::QueryParser Syntax":http://www.xapian.org/docs/queryparser.html
-Queries can include prefix:value parts, according to what you indexed in the
-acts_as_xapian part above. You can also say things like model:InfoRequestEvent
-to constrain by model in more complex ways than the :model parameter, or
-modelid:InfoRequestEvent-100 to only find one specific object.
-
-Returns an ActsAsXapian::Search object. Useful methods are:
-* description - a techy one, to check how the query has been parsed
-* matches_estimated - a guesstimate at the total number of hits
-* spelling_correction - the corrected query string if there is a correction, otherwise nil
-* words_to_highlight - list of words for you to highlight, perhaps with TextHelper::highlight
-* results - an array of hashes each containing:
-** :model - your Rails model, this is what you most want!
-** :weight - relevancy measure
-** :percent - the weight as a %, 0 meaning the item did not match the query at all
-** :collapse_count - number of results with the same prefix, if you specified collapse_by_prefix
-
-Finding similar models
-----------------------
-
-To find models that are similar to a given set of models call ActsAsXapian::Similar.new. This takes:
-* model_classes - list of model classes to return models from within
-* models - list of models that you want to find related ones to
-
-Returns an ActsAsXapian::Similar object. Has all methods from ActsAsXapian::Search above, except
-for words_to_highlight. In addition has:
-* important_terms - the terms extracted from the input models, that were used to search for output
-You need the results methods to get the similar models.
-
-
-f. Configuration
-================
-
-If you want to customise the configuration of acts_as_xapian, it will look for
-a file called 'xapian.yml' under Rails.root/config. As is familiar from the
-format of the database.yml file, separate :development, :test and :production
-sections are expected.
-
-The following options are available:
-* base_db_path - specifies the directory, relative to Rails.root, in which
-acts_as_xapian stores its search index databases. Default is the directory
-xapiandbs within the acts_as_xapian directory.
-
-
-g. Performance
-==============
-
-On development sites, acts_as_xapian automatically logs the time taken to do
-searches.  The time displayed is for the Xapian parts of the query; the Rails
-database model lookups will be logged separately by ActiveRecord. Example:
-
-    Xapian query (0.00029s) Search: hello
-
-To enable this, and other performance logging, on a production site,
-temporarily add this to the end of your config/environment.rb
-
-    ActiveRecord::Base.logger = Logger.new(STDOUT)
-
-
-h. Support
-==========
-
-Please ask any questions on the
-"acts_as_xapian Google Group":http://groups.google.com/group/acts_as_xapian
-
-The official home page and repository for acts_as_xapian are the
-"acts_as_xapian github page":http://github.com/frabcus/acts_as_xapian/wikis
-
-For more details about anything, see source code in lib/acts_as_xapian.rb
-
-Merging source instructions "Using git for collaboration" here:
-http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html
diff --git a/vendor/plugins/acts_as_xapian/generators/acts_as_xapian/USAGE b/vendor/plugins/acts_as_xapian/generators/acts_as_xapian/USAGE
deleted file mode 100644
index 2d027c46f..000000000
--- a/vendor/plugins/acts_as_xapian/generators/acts_as_xapian/USAGE
+++ /dev/null
@@ -1 +0,0 @@
-./script/generate acts_as_xapian
diff --git a/vendor/plugins/acts_as_xapian/generators/acts_as_xapian/acts_as_xapian_generator.rb b/vendor/plugins/acts_as_xapian/generators/acts_as_xapian/acts_as_xapian_generator.rb
deleted file mode 100644
index a1cd1801d..000000000
--- a/vendor/plugins/acts_as_xapian/generators/acts_as_xapian/acts_as_xapian_generator.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class ActsAsXapianGenerator < Rails::Generator::Base
-  def manifest
-    record do |m|
-      m.migration_template 'migration.rb', 'db/migrate',
-        :migration_file_name => "create_acts_as_xapian"
-    end
-  end
-  
-  protected
-    def banner
-      "Usage: #{$0} acts_as_xapian"
-    end
-end
diff --git a/vendor/plugins/acts_as_xapian/generators/acts_as_xapian/templates/migration.rb b/vendor/plugins/acts_as_xapian/generators/acts_as_xapian/templates/migration.rb
deleted file mode 100644
index 84a9dd766..000000000
--- a/vendor/plugins/acts_as_xapian/generators/acts_as_xapian/templates/migration.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class CreateActsAsXapian < ActiveRecord::Migration
-  def self.up
-    create_table :acts_as_xapian_jobs do |t|
-      t.column :model, :string, :null => false
-      t.column :model_id, :integer, :null => false
-      t.column :action, :string, :null => false
-    end
-    add_index :acts_as_xapian_jobs, [:model, :model_id], :unique => true
-  end
-  def self.down
-    drop_table :acts_as_xapian_jobs
-  end
-end
-
diff --git a/vendor/plugins/acts_as_xapian/init.rb b/vendor/plugins/acts_as_xapian/init.rb
deleted file mode 100644
index 1e5b8557b..000000000
--- a/vendor/plugins/acts_as_xapian/init.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# acts_as_xapian/init.rb:
-#
-# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
-# Email: hello@mysociety.org; WWW: http://www.mysociety.org/
-
-require 'acts_as_xapian'
-
diff --git a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb b/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
deleted file mode 100644
index 2e486f328..000000000
--- a/vendor/plugins/acts_as_xapian/lib/acts_as_xapian.rb
+++ /dev/null
@@ -1,979 +0,0 @@
-# encoding: utf-8
-# acts_as_xapian/lib/acts_as_xapian.rb:
-# Xapian full text search in Ruby on Rails.
-#
-# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
-# Email: hello@mysociety.org; WWW: http://www.mysociety.org/
-#
-# Documentation
-# =============
-#
-# See ../README.txt foocumentation. Please update that file if you edit
-# code.
-
-# Make it so if Xapian isn't installed, the Rails app doesn't fail completely,
-# just when somebody does a search.
-begin
-    require 'xapian'
-    $acts_as_xapian_bindings_available = true
-rescue LoadError
-    STDERR.puts "acts_as_xapian: No Ruby bindings for Xapian installed"
-    $acts_as_xapian_bindings_available = false
-end
-
-module ActsAsXapian
-    ######################################################################
-    # Module level variables
-    # XXX must be some kind of cattr_accessor that can do this better
-    def ActsAsXapian.bindings_available
-        $acts_as_xapian_bindings_available
-    end
-    class NoXapianRubyBindingsError < StandardError
-    end
-
-    @@db = nil
-    @@db_path = nil
-    @@writable_db = nil
-    @@init_values = []
-
-    # There used to be a problem with this module being loaded more than once.
-    # Keep a check here, so we can tell if the problem recurs.
-    if $acts_as_xapian_class_var_init
-        raise "The acts_as_xapian module has already been loaded"
-    else
-        $acts_as_xapian_class_var_init = true
-    end
-
-    def ActsAsXapian.db
-        @@db
-    end
-    def ActsAsXapian.db_path=(db_path)
-        @@db_path = db_path
-    end
-    def ActsAsXapian.db_path
-        @@db_path
-    end
-    def ActsAsXapian.writable_db
-        @@writable_db
-    end
-    def ActsAsXapian.stemmer
-        @@stemmer
-    end
-    def ActsAsXapian.term_generator
-        @@term_generator
-    end
-    def ActsAsXapian.enquire
-        @@enquire
-    end
-    def ActsAsXapian.query_parser
-        @@query_parser
-    end
-    def ActsAsXapian.values_by_prefix
-        @@values_by_prefix
-    end
-    def ActsAsXapian.config
-      @@config
-    end
-
-    ######################################################################
-    # Initialisation
-    def ActsAsXapian.init(classname = nil, options = nil)
-        if not classname.nil?
-            # store class and options for use later, when we open the db in readable_init
-            @@init_values.push([classname,options])
-        end
-    end
-
-    # Reads the config file (if any) and sets up the path to the database we'll be using
-    def ActsAsXapian.prepare_environment
-      return unless @@db_path.nil?
-
-      # barf if we can't figure out the environment
-      environment = (ENV['RAILS_ENV'] or Rails.env)
-      raise "Set RAILS_ENV, so acts_as_xapian can find the right Xapian database" if not environment
-
-      # check for a config file
-      config_file = Rails.root.join("config","xapian.yml")
-      @@config = File.exists?(config_file) ? YAML.load_file(config_file)[environment] : {}
-
-      # figure out where the DBs should go
-      if config['base_db_path']
-        db_parent_path = Rails.root.join(config['base_db_path'])
-      else
-        db_parent_path = File.join(File.dirname(__FILE__), '../xapiandbs/')
-      end
-
-      # make the directory for the xapian databases to go in
-      Dir.mkdir(db_parent_path) unless File.exists?(db_parent_path)
-
-      @@db_path = File.join(db_parent_path, environment)
-
-      # make some things that don't depend on the db
-      # XXX this gets made once for each acts_as_xapian. Oh well.
-      @@stemmer = Xapian::Stem.new('english')
-    end
-
-    # 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
-        raise NoXapianRubyBindingsError.new("Xapian Ruby bindings not installed") unless ActsAsXapian.bindings_available
-        raise "acts_as_xapian hasn't been called in any models" if @@init_values.empty?
-
-        prepare_environment
-
-        # We need to reopen the database each time, so Xapian gets changes to it.
-        # Calling reopen() does not always pick up changes for reasons that I can
-        # only speculate about at the moment. (It is easy to reproduce this by
-        # changing the code below to use reopen() rather than open() followed by
-        # close(), and running rake spec.)
-        if !@@db.nil?
-            @@db.close
-        end
-
-        # basic Xapian objects
-        begin
-            @@db = Xapian::Database.new(@@db_path)
-            @@enquire = Xapian::Enquire.new(@@db)
-        rescue IOError => e
-            raise "Failed to open Xapian database #{@@db_path}: #{e.message}"
-        end
-
-        init_query_parser
-    end
-
-    # Make a new query parser
-    def ActsAsXapian.init_query_parser
-        # for queries
-        @@query_parser = Xapian::QueryParser.new
-        @@query_parser.stemmer = @@stemmer
-        @@query_parser.stemming_strategy = Xapian::QueryParser::STEM_SOME
-        @@query_parser.database = @@db
-        @@query_parser.default_op = Xapian::Query::OP_AND
-        begin
-            @@query_parser.set_max_wildcard_expansion(1000)
-        rescue NoMethodError
-            # The set_max_wildcard_expansion method was introduced in Xapian 1.2.7,
-            # so may legitimately not be available.
-            #
-            # Large installations of Alaveteli should consider
-            # upgrading, because uncontrolled wildcard expansion
-            # can crash the whole server: see http://trac.xapian.org/ticket/350
-        end
-
-        @@stopper = Xapian::SimpleStopper.new
-        @@stopper.add("and")
-        @@stopper.add("of")
-        @@stopper.add("&")
-        @@query_parser.stopper = @@stopper
-
-        @@terms_by_capital = {}
-        @@values_by_number = {}
-        @@values_by_prefix = {}
-        @@value_ranges_store = []
-
-        for init_value_pair in @@init_values
-            classname = init_value_pair[0]
-            options = init_value_pair[1]
-
-            # go through the various field types, and tell query parser about them,
-            # and error check them - i.e. check for consistency between models
-            @@query_parser.add_boolean_prefix("model", "M")
-            @@query_parser.add_boolean_prefix("modelid", "I")
-            if options[:terms]
-              for term in options[:terms]
-                  raise "Use a single capital letter for term code" if not term[1].match(/^[A-Z]$/)
-                  raise "M and I are reserved for use as the model/id term" if term[1] == "M" or term[1] == "I"
-                  raise "model and modelid are reserved for use as the model/id prefixes" if term[2] == "model" or term[2] == "modelid"
-                  raise "Z is reserved for stemming terms" if term[1] == "Z"
-                  raise "Already have code '" + term[1] + "' in another model but with different prefix '" + @@terms_by_capital[term[1]] + "'" if @@terms_by_capital.include?(term[1]) && @@terms_by_capital[term[1]] != term[2]
-                  @@terms_by_capital[term[1]] = term[2]
-                  # XXX use boolean here so doesn't stem our URL names in WhatDoTheyKnow
-                  # If making acts_as_xapian generic, would really need to make the :terms have
-                  # another option that lets people choose non-boolean for terms that need it
-                  # (i.e. searching explicitly within a free text field)
-                  @@query_parser.add_boolean_prefix(term[2], term[1])
-              end
-            end
-            if options[:values]
-              for value in options[:values]
-                  raise "Value index '"+value[1].to_s+"' must be an integer, is " + value[1].class.to_s if value[1].class != 1.class
-                  raise "Already have value index '" + value[1].to_s + "' in another model but with different prefix '" + @@values_by_number[value[1]].to_s + "'" if @@values_by_number.include?(value[1]) && @@values_by_number[value[1]] != value[2]
-
-                  # date types are special, mark them so the first model they're seen for
-                  if !@@values_by_number.include?(value[1])
-                      if value[3] == :date
-                          value_range = Xapian::DateValueRangeProcessor.new(value[1])
-                      elsif value[3] == :string
-                          value_range = Xapian::StringValueRangeProcessor.new(value[1])
-                      elsif value[3] == :number
-                          value_range = Xapian::NumberValueRangeProcessor.new(value[1])
-                      else
-                          raise "Unknown value type '" + value[3].to_s + "'"
-                      end
-
-                      @@query_parser.add_valuerangeprocessor(value_range)
-
-                      # stop it being garbage collected, as
-                      # add_valuerangeprocessor ref is outside Ruby's GC
-                      @@value_ranges_store.push(value_range)
-                  end
-
-                  @@values_by_number[value[1]] = value[2]
-                  @@values_by_prefix[value[2]] = value[1]
-              end
-            end
-        end
-    end
-
-    def ActsAsXapian.writable_init(suffix = "")
-        raise NoXapianRubyBindingsError.new("Xapian Ruby bindings not installed") unless ActsAsXapian.bindings_available
-        raise "acts_as_xapian hasn't been called in any models" if @@init_values.empty?
-
-        # if DB is not nil, then we're already initialised, so don't do it
-        # again XXX reopen it each time, xapian_spec.rb needs this so database
-        # gets written twice correctly.
-        # return unless @@writable_db.nil?
-
-        prepare_environment
-
-        full_path = @@db_path + suffix
-
-        # for indexing
-        @@writable_db = Xapian::WritableDatabase.new(full_path, Xapian::DB_CREATE_OR_OPEN)
-        @@enquire = Xapian::Enquire.new(@@writable_db)
-        @@term_generator = Xapian::TermGenerator.new()
-        @@term_generator.set_flags(Xapian::TermGenerator::FLAG_SPELLING, 0)
-        @@term_generator.database = @@writable_db
-        @@term_generator.stemmer = @@stemmer
-    end
-
-    ######################################################################
-    # Search with a query or for similar models
-
-    # Base class for Search and Similar below
-    class QueryBase
-        attr_accessor :offset
-        attr_accessor :limit
-        attr_accessor :query
-        attr_accessor :matches
-        attr_accessor :query_models
-        attr_accessor :runtime
-        attr_accessor :cached_results
-
-        def initialize_db
-            self.runtime = 0.0
-
-            ActsAsXapian.readable_init
-            if ActsAsXapian.db.nil?
-                raise "ActsAsXapian not initialized"
-            end
-        end
-
-        MSET_MAX_TRIES = 5
-        MSET_MAX_DELAY = 5
-        # Set self.query before calling this
-        def initialize_query(options)
-            #raise options.to_yaml
-
-            self.runtime += Benchmark::realtime {
-                offset = options[:offset] || 0; offset = offset.to_i
-                limit = options[:limit]
-                raise "please specifiy maximum number of results to return with parameter :limit" if not limit
-                limit = limit.to_i
-                sort_by_prefix = options[:sort_by_prefix] || nil
-                sort_by_ascending = options[:sort_by_ascending].nil? ? true : options[:sort_by_ascending]
-                collapse_by_prefix = options[:collapse_by_prefix] || nil
-
-                ActsAsXapian.enquire.query = self.query
-
-                if sort_by_prefix.nil?
-                    ActsAsXapian.enquire.sort_by_relevance!
-                else
-                    value = ActsAsXapian.values_by_prefix[sort_by_prefix]
-                    raise "couldn't find prefix '" + sort_by_prefix.to_s + "'" if value.nil?
-                    ActsAsXapian.enquire.sort_by_value_then_relevance!(value, sort_by_ascending)
-                end
-                if collapse_by_prefix.nil?
-                    ActsAsXapian.enquire.collapse_key = Xapian.BAD_VALUENO
-                else
-                    value = ActsAsXapian.values_by_prefix[collapse_by_prefix]
-                    raise "couldn't find prefix '" + collapse_by_prefix + "'" if value.nil?
-                    ActsAsXapian.enquire.collapse_key = value
-                end
-
-                tries = 0
-                delay = 1
-                begin
-                    self.matches = ActsAsXapian.enquire.mset(offset, limit, 100)
-                rescue IOError => e
-                    if e.message =~ /DatabaseModifiedError: /
-                        # This should be a transient error, so back off and try again, up to a point
-                        if tries > MSET_MAX_TRIES
-                            raise "Received DatabaseModifiedError from Xapian even after retrying #{MSET_MAX_TRIES} times"
-                        else
-                            sleep delay
-                        end
-                        tries += 1
-                        delay *= 2
-                        delay = MSET_MAX_DELAY if delay > MSET_MAX_DELAY
-
-                        ActsAsXapian.db.reopen()
-                        retry
-                    else
-                        raise
-                    end
-                end
-                self.cached_results = nil
-            }
-        end
-
-        # Return a description of the query
-        def description
-            self.query.description
-        end
-
-        # Does the query have non-prefixed search terms in it?
-        def has_normal_search_terms?
-            ret = false
-            #x = ''
-            for t in self.query.terms
-                term = t.term
-                #x = x + term.to_yaml + term.size.to_s + term[0..0] + "*"
-                if term.size >= 2 && term[0..0] == 'Z'
-                    # normal terms begin Z (for stemmed), then have no capital letter prefix
-                    if term[1..1] == term[1..1].downcase
-                        ret = true
-                    end
-                end
-            end
-            return ret
-        end
-
-        # Estimate total number of results
-        def matches_estimated
-            self.matches.matches_estimated
-        end
-
-        # Return query string with spelling correction
-        def spelling_correction
-            correction = ActsAsXapian.query_parser.get_corrected_query_string
-            if correction.empty?
-                return nil
-            end
-            return correction
-        end
-
-        # Return array of models found
-        def results
-            # If they've already pulled out the results, just return them.
-            if !self.cached_results.nil?
-                return self.cached_results
-            end
-
-            docs = []
-            self.runtime += Benchmark::realtime {
-                # Pull out all the results
-                iter = self.matches._begin
-                while not iter.equals(self.matches._end)
-                    docs.push({:data => iter.document.data,
-                            :percent => iter.percent,
-                            :weight => iter.weight,
-                            :collapse_count => iter.collapse_count})
-                    iter.next
-                end
-            }
-
-            # Log time taken, excluding database lookups below which will be displayed separately by ActiveRecord
-            if ActiveRecord::Base.logger
-                ActiveRecord::Base.logger.add(Logger::DEBUG, "  Xapian query (#{'%.5fs' % self.runtime}) #{self.log_description}")
-            end
-
-            # Look up without too many SQL queries
-            lhash = {}
-            lhash.default = []
-            for doc in docs
-                k = doc[:data].split('-')
-                lhash[k[0]] = lhash[k[0]] + [k[1]]
-            end
-            # for each class, look up all ids
-            chash = {}
-            for cls, ids in lhash
-                conditions = [ "#{cls.constantize.table_name}.#{cls.constantize.primary_key} in (?)", ids ]
-                found = cls.constantize.find(:all, :conditions => conditions, :include => cls.constantize.xapian_options[:eager_load])
-                for f in found
-                    chash[[cls, f.id]] = f
-                end
-            end
-            # now get them in right order again
-            results = []
-            docs.each do |doc|
-                k = doc[:data].split('-')
-                model_instance = chash[[k[0], k[1].to_i]]
-                if model_instance
-                    results << { :model => model_instance,
-                                 :percent => doc[:percent],
-                                 :weight => doc[:weight],
-                                 :collapse_count => doc[:collapse_count] }
-                end
-            end
-            self.cached_results = results
-            return results
-        end
-    end
-
-    # Search for a query string, returns an array of hashes in result order.
-    # Each hash contains the actual Rails object in :model, and other detail
-    # about relevancy etc. in other keys.
-    class Search < QueryBase
-        attr_accessor :query_string
-
-        # Note that model_classes is not only sometimes useful here - it's
-        # essential to make sure the classes have been loaded, and thus
-        # acts_as_xapian called on them, so we know the fields for the query
-        # parser.
-
-        # model_classes - model classes to search within, e.g. [PublicBody,
-        # User]. Can take a single model class, or you can express the model
-        # class names in strings if you like.
-        # query_string - user inputed query string, with syntax much like Google Search
-        def initialize(model_classes, query_string, options = {}, user_query = nil)
-            # Check parameters, convert to actual array of model classes
-            new_model_classes = []
-            model_classes = [model_classes] if model_classes.class != Array
-            for model_class in model_classes
-                raise "pass in the model class itself, or a string containing its name" if model_class.class != Class && model_class.class != String
-                model_class = model_class.constantize if model_class.class == String
-                new_model_classes.push(model_class)
-            end
-            model_classes = new_model_classes
-
-            # Set things up
-            self.initialize_db
-
-            # Case of a string, searching for a Google-like syntax query
-            self.query_string = query_string
-
-            # Construct query which only finds things from specified models
-            model_query = Xapian::Query.new(Xapian::Query::OP_OR, model_classes.map{|mc| "M" + mc.to_s})
-            if user_query.nil?
-                user_query = ActsAsXapian.query_parser.parse_query(
-                                       self.query_string,
-                                       Xapian::QueryParser::FLAG_BOOLEAN | Xapian::QueryParser::FLAG_PHRASE |
-                                       Xapian::QueryParser::FLAG_LOVEHATE |
-                                       Xapian::QueryParser::FLAG_SPELLING_CORRECTION)
-            end
-            self.query = Xapian::Query.new(Xapian::Query::OP_AND, model_query, user_query)
-
-            # Call base class constructor
-            self.initialize_query(options)
-        end
-
-        # Return just normal words in the query i.e. Not operators, ones in
-        # date ranges or similar. Use this for cheap highlighting with
-        # TextHelper::highlight, and excerpt.
-        def words_to_highlight
-            # TODO: In Ruby 1.9 we can do matching of any unicode letter with \p{L}
-            # But we still need to support ruby 1.8 for the time being so...
-            query_nopunc = self.query_string.gsub(/[^ёЁа-яА-Яa-zA-Zà-üÀ-Ü0-9:\.\/_]/iu, " ")
-            query_nopunc = query_nopunc.gsub(/\s+/, " ")
-            words = query_nopunc.split(" ")
-            # Remove anything with a :, . or / in it
-            words = words.find_all {|o| !o.match(/(:|\.|\/)/) }
-            words = words.find_all {|o| !o.match(/^(AND|NOT|OR|XOR)$/) }
-            return words
-        end
-
-        # Text for lines in log file
-        def log_description
-            "Search: " + self.query_string
-        end
-
-    end
-
-    # Search for models which contain theimportant terms taken from a specified
-    # list of models. i.e. Use to find documents similar to one (or more)
-    # documents, or use to refine searches.
-    class Similar < QueryBase
-        attr_accessor :query_models
-        attr_accessor :important_terms
-
-        # model_classes - model classes to search within, e.g. [PublicBody, User]
-        # query_models - list of models you want to find things similar to
-        def initialize(model_classes, query_models, options = {})
-            self.initialize_db
-
-            self.runtime += Benchmark::realtime {
-                # Case of an array, searching for models similar to those models in the array
-                self.query_models = query_models
-
-                # Find the documents by their unique term
-                input_models_query = Xapian::Query.new(Xapian::Query::OP_OR, query_models.map{|m| "I" + m.xapian_document_term})
-                ActsAsXapian.enquire.query = input_models_query
-                matches = ActsAsXapian.enquire.mset(0, 100, 100) # XXX so this whole method will only work with 100 docs
-
-                # Get set of relevant terms for those documents
-                selection = Xapian::RSet.new()
-                iter = matches._begin
-                while not iter.equals(matches._end)
-                    selection.add_document(iter)
-                    iter.next
-                end
-
-                # Bit weird that the function to make esets is part of the enquire
-                # object. This explains what exactly it does, which is to exclude
-                # terms in the existing query.
-                # http://thread.gmane.org/gmane.comp.search.xapian.general/3673/focus=3681
-                eset = ActsAsXapian.enquire.eset(40, selection)
-
-                # Do main search for them
-                self.important_terms = []
-                iter = eset._begin
-                while not iter.equals(eset._end)
-                    self.important_terms.push(iter.term)
-                    iter.next
-                end
-                similar_query = Xapian::Query.new(Xapian::Query::OP_OR, self.important_terms)
-                # Exclude original
-                combined_query = Xapian::Query.new(Xapian::Query::OP_AND_NOT, similar_query, input_models_query)
-
-                # Restrain to model classes
-                model_query = Xapian::Query.new(Xapian::Query::OP_OR, model_classes.map{|mc| "M" + mc.to_s})
-                self.query = Xapian::Query.new(Xapian::Query::OP_AND, model_query, combined_query)
-            }
-
-            # Call base class constructor
-            self.initialize_query(options)
-        end
-
-        # Text for lines in log file
-        def log_description
-            "Similar: " + self.query_models.to_s
-        end
-    end
-
-    ######################################################################
-    # Index
-
-    # Offline indexing job queue model, create with migration made
-    # using "script/generate acts_as_xapian" as described in ../README.txt
-    class ActsAsXapianJob < ActiveRecord::Base
-    end
-
-    # Update index with any changes needed, call this offline. Usually call it
-    # from a script that exits - otherwise Xapian's writable database won't
-    # flush your changes. Specifying flush will reduce performance, but make
-    # sure that each index update is definitely saved to disk before
-    # logging in the database that it has been.
-    def ActsAsXapian.update_index(flush = false, verbose = false)
-        # STDOUT.puts("start of ActsAsXapian.update_index") if verbose
-
-        # Before calling writable_init we have to make sure every model class has been initialized.
-        # i.e. has had its class code loaded, so acts_as_xapian has been called inside it, and
-        # we have the info from acts_as_xapian.
-        model_classes = ActsAsXapianJob.find_by_sql("select model from acts_as_xapian_jobs group by model").map {|a| a.model.constantize}
-        # If there are no models in the queue, then nothing to do
-        return if model_classes.size == 0
-
-        ActsAsXapian.writable_init
-        # Abort if full rebuild is going on
-        new_path = ActsAsXapian.db_path + ".new"
-        if File.exist?(new_path)
-            raise "aborting incremental index update while full index rebuild happens; found existing " + new_path
-        end
-
-        ids_to_refresh = ActsAsXapianJob.find(:all).map() { |i| i.id }
-        for id in ids_to_refresh
-            job = nil
-            begin
-                ActiveRecord::Base.transaction do
-                    begin
-                        job = ActsAsXapianJob.find(id, :lock =>true)
-                    rescue ActiveRecord::RecordNotFound => e
-                        # This could happen if while we are working the model
-                        # was updated a second time by another process. In that case
-                        # ActsAsXapianJob.delete_all in xapian_mark_needs_index below
-                        # might have removed the first job record while we are working on it.
-                        #STDERR.puts("job with #{id} vanished under foot") if verbose
-                        next
-                    end
-                    STDOUT.puts("ActsAsXapian.update_index #{job.action} #{job.model} #{job.model_id.to_s} #{Time.now.to_s}") if verbose
-
-                    begin
-                        if job.action == 'update'
-                            # XXX Index functions may reference other models, so we could eager load here too?
-                            model = job.model.constantize.find(job.model_id) # :include => cls.constantize.xapian_options[:include]
-                            model.xapian_index
-                        elsif job.action == 'destroy'
-                            # Make dummy model with right id, just for destruction
-                            model = job.model.constantize.new
-                            model.id = job.model_id
-                            model.xapian_destroy
-                        else
-                            raise "unknown ActsAsXapianJob action '" + job.action + "'"
-                        end
-                    rescue ActiveRecord::RecordNotFound => e
-                        # this can happen if the record was hand deleted in the database
-                        job.action = 'destroy'
-                        retry
-                    end
-                    if flush
-                        ActsAsXapian.writable_db.flush
-                    end
-                    job.destroy
-                end
-            rescue => detail
-                # print any error, and carry on so other things are indexed
-                STDERR.puts(detail.backtrace.join("\n") + "\nFAILED ActsAsXapian.update_index job #{id} #{$!} " + (job.nil? ? "" : "model " + job.model + " id " + job.model_id.to_s))
-            end
-        end
-        # We close the database when we're finished to remove the lock file. Since writable_init
-        # reopens it and recreates the environment every time we don't need to do further cleanup
-        ActsAsXapian.writable_db.flush
-        ActsAsXapian.writable_db.close
-    end
-
-    def ActsAsXapian._is_xapian_db(path)
-        is_db = File.exist?(File.join(path, "iamflint")) || File.exist?(File.join(path, "iamchert"))
-        return is_db
-    end
-
-    # You must specify *all* the models here, this totally rebuilds the Xapian
-    # database.  You'll want any readers to reopen the database after this.
-    #
-    # Incremental update_index calls above are suspended while this rebuild
-    # happens (i.e. while the .new database is there) - any index update jobs
-    # are left in the database, and will run after the rebuild has finished.
-
-    def ActsAsXapian.rebuild_index(model_classes, verbose = false, terms = true, values = true, texts = true, safe_rebuild = true)
-        #raise "when rebuilding all, please call as first and only thing done in process / task" if not ActsAsXapian.writable_db.nil?
-        prepare_environment
-
-        update_existing = !(terms == true && values == true && texts == true)
-        # Delete any existing .new database, and open a new one which is a copy of the current one
-        new_path = ActsAsXapian.db_path + ".new"
-        old_path = ActsAsXapian.db_path
-        if File.exist?(new_path)
-            raise "found existing " + new_path + " which is not Xapian flint database, please delete for me" if not ActsAsXapian._is_xapian_db(new_path)
-            FileUtils.rm_r(new_path)
-        end
-        if update_existing
-            FileUtils.cp_r(old_path, new_path)
-        end
-        ActsAsXapian.writable_init
-        ActsAsXapian.writable_db.close # just to make an empty one to read
-        # Index everything
-        if safe_rebuild
-            _rebuild_index_safely(model_classes, verbose, terms, values, texts)
-        else
-            @@db_path = ActsAsXapian.db_path + ".new"
-            ActsAsXapian.writable_init
-            # Save time by running the indexing in one go and in-process
-            for model_class in model_classes
-                STDOUT.puts("ActsAsXapian.rebuild_index: Rebuilding #{model_class.to_s}") if verbose
-                model_class.find(:all).each do |model|
-                  STDOUT.puts("ActsAsXapian.rebuild_index      #{model_class} #{model.id}") if verbose
-                  model.xapian_index(terms, values, texts)
-                end
-            end
-            ActsAsXapian.writable_db.flush
-            ActsAsXapian.writable_db.close
-        end
-
-        # Rename into place
-        temp_path = old_path + ".tmp"
-        if File.exist?(temp_path)
-            @@db_path = old_path
-            raise "temporary database found " + temp_path + " which is not Xapian flint database, please delete for me" if not ActsAsXapian._is_xapian_db(temp_path)
-            FileUtils.rm_r(temp_path)
-        end
-        if File.exist?(old_path)
-            FileUtils.mv old_path, temp_path
-        end
-        FileUtils.mv new_path, old_path
-
-        # Delete old database
-        if File.exist?(temp_path)
-            if not ActsAsXapian._is_xapian_db(temp_path)
-                @@db_path = old_path
-                raise "old database now at " + temp_path + " is not Xapian flint database, please delete for me"
-            end
-            FileUtils.rm_r(temp_path)
-        end
-
-        # You'll want to restart your FastCGI or Mongrel processes after this,
-        # so they get the new db
-        @@db_path = old_path
-    end
-
-    def ActsAsXapian._rebuild_index_safely(model_classes, verbose, terms, values, texts)
-        batch_size = 1000
-        for model_class in model_classes
-            model_class_count = model_class.count
-            0.step(model_class_count, batch_size) do |i|
-              # We fork here, so each batch is run in a different process. This is
-              # because otherwise we get a memory "leak" and you can't rebuild very
-              # large databases (however long you have!)
-
-              ActiveRecord::Base.connection.disconnect!
-
-              pid = Process.fork # XXX this will only work on Unix, tough
-              if pid
-                    Process.waitpid(pid)
-                    if not $?.success?
-                        raise "batch fork child failed, exiting also"
-                    end
-                    # database connection doesn't survive a fork, rebuild it
-              else
-                    # fully reopen the database each time (with a new object)
-                    # (so doc ids and so on aren't preserved across the fork)
-                    ActiveRecord::Base.establish_connection
-                    @@db_path = ActsAsXapian.db_path + ".new"
-                    ActsAsXapian.writable_init
-                    STDOUT.puts("ActsAsXapian.rebuild_index: New batch. #{model_class.to_s} from #{i} to #{i + batch_size} of #{model_class_count} pid #{Process.pid.to_s}") if verbose
-                    model_class.find(:all, :limit => batch_size, :offset => i, :order => :id).each do |model|
-                      STDOUT.puts("ActsAsXapian.rebuild_index      #{model_class} #{model.id}") if verbose
-                      model.xapian_index(terms, values, texts)
-                    end
-                    ActsAsXapian.writable_db.flush
-                    ActsAsXapian.writable_db.close
-                    # database connection won't survive a fork, so shut it down
-                    ActiveRecord::Base.connection.disconnect!
-                    # brutal exit, so other shutdown code not run (for speed and safety)
-                    Kernel.exit! 0
-              end
-
-              ActiveRecord::Base.establish_connection
-
-            end
-        end
-    end
-
-    ######################################################################
-    # Instance methods that get injected into your model.
-
-    module InstanceMethods
-        # Used internally
-        def xapian_document_term
-            self.class.to_s + "-" + self.id.to_s
-        end
-
-        def xapian_value(field, type = nil, index_translations = false)
-            if index_translations && self.respond_to?("translations")
-                if type == :date or type == :boolean
-                    value = single_xapian_value(field, type = type)
-                else
-                    values = []
-                    for locale in self.translations.map{|x| x.locale}
-                        I18n.with_locale(locale) do
-                            values << single_xapian_value(field, type=type)
-                        end
-                    end
-                    if values[0].kind_of?(Array)
-                        values = values.flatten
-                        value = values.reject{|x| x.nil?}
-                    else
-                        values = values.reject{|x| x.nil?}
-                        value = values.join(" ")
-                    end
-                end
-            else
-                value = single_xapian_value(field, type = type)
-            end
-            return value
-        end
-
-        # Extract value of a field from the model
-        def single_xapian_value(field, type = nil)
-            value = self.send(field.to_sym) || self[field]
-            if type == :date
-                if value.kind_of?(Time)
-                    value.utc.strftime("%Y%m%d")
-                elsif value.kind_of?(Date)
-                    value.to_time.utc.strftime("%Y%m%d")
-                else
-                    raise "Only Time or Date types supported by acts_as_xapian for :date fields, got " + value.class.to_s
-                end
-            elsif type == :boolean
-                value ? true : false
-            else
-                # Arrays are for terms which require multiple of them, e.g. tags
-                if value.kind_of?(Array)
-                    value.map {|v| v.to_s}
-                else
-                    value.to_s
-                end
-            end
-        end
-
-        # Store record in the Xapian database
-        def xapian_index(terms = true, values = true, texts = true)
-            # if we have a conditional function for indexing, call it and destroy object if failed
-            if self.class.xapian_options.include?(:if)
-                if_value = xapian_value(self.class.xapian_options[:if], :boolean)
-                if not if_value
-                    self.xapian_destroy
-                    return
-                end
-            end
-
-            existing_query = Xapian::Query.new("I" + self.xapian_document_term)
-            ActsAsXapian.enquire.query = existing_query
-            match = ActsAsXapian.enquire.mset(0,1,1).matches[0]
-
-            if !match.nil?
-                doc = match.document
-            else
-                doc = Xapian::Document.new
-                doc.data = self.xapian_document_term
-                doc.add_term("M" + self.class.to_s)
-                doc.add_term("I" + doc.data)
-            end
-            # work out what to index
-            # 1. Which terms to index?  We allow the user to specify particular ones
-            terms_to_index = []
-            drop_all_terms = false
-            if terms and self.xapian_options[:terms]
-              terms_to_index = self.xapian_options[:terms].dup
-              if terms.is_a?(String)
-                  terms_to_index.reject!{|term| !terms.include?(term[1])}
-                  if terms_to_index.length == self.xapian_options[:terms].length
-                      drop_all_terms = true
-                  end
-              else
-                  drop_all_terms = true
-              end
-            end
-            # 2. Texts to index?  Currently, it's all or nothing
-            texts_to_index = []
-            if texts and self.xapian_options[:texts]
-                texts_to_index = self.xapian_options[:texts]
-            end
-            # 3. Values to index?  Currently, it's all or nothing
-            values_to_index = []
-            if values and self.xapian_options[:values]
-                values_to_index = self.xapian_options[:values]
-            end
-
-            # clear any existing data that we might want to replace
-            if drop_all_terms && texts
-                # as an optimisation, if we're reindexing all of both, we remove everything
-                doc.clear_terms
-                doc.add_term("M" + self.class.to_s)
-                doc.add_term("I" + doc.data)
-            else
-                term_prefixes_to_index = terms_to_index.map {|x| x[1]}
-                for existing_term in doc.terms
-                    first_letter = existing_term.term[0...1]
-                    if !"MI".include?(first_letter) # it's not one of the reserved value
-                        if first_letter.match("^[A-Z]+") # it's a "value" (rather than indexed text)
-                            if term_prefixes_to_index.include?(first_letter) # it's a value that we've been asked to index
-                                doc.remove_term(existing_term.term)
-                            end
-                        elsif texts
-                            doc.remove_term(existing_term.term) # it's text and we've been asked to reindex it
-                        end
-                    end
-                end
-            end
-
-            for term in terms_to_index
-                value = xapian_value(term[0])
-                if value.kind_of?(Array)
-                    for v in value
-                        doc.add_term(term[1] + v)
-                    end
-                else
-                    doc.add_term(term[1] + value)
-                end
-            end
-
-            if values
-                doc.clear_values
-                for value in values_to_index
-                    doc.add_value(value[1], xapian_value(value[0], value[3]))
-                end
-            end
-            if texts
-                ActsAsXapian.term_generator.document = doc
-                for text in texts_to_index
-                    ActsAsXapian.term_generator.increase_termpos # stop phrases spanning different text fields
-                    # XXX the "1" here is a weight that could be varied for a boost function
-                    ActsAsXapian.term_generator.index_text(xapian_value(text, nil, true), 1)
-                end
-            end
-
-            ActsAsXapian.writable_db.replace_document("I" + doc.data, doc)
-        end
-
-        # Delete record from the Xapian database
-        def xapian_destroy
-            ActsAsXapian.writable_db.delete_document("I" + self.xapian_document_term)
-        end
-
-        # Used to mark changes needed by batch indexer
-        def xapian_mark_needs_index
-            xapian_create_job('update', self.class.base_class.to_s, self.id)
-        end
-
-        def xapian_mark_needs_destroy
-            xapian_create_job('destroy', self.class.base_class.to_s, self.id)
-        end
-
-        # Allow reindexing to be skipped if a flag is set
-        def xapian_mark_needs_index_if_reindex
-            return true if (self.respond_to?(:no_xapian_reindex) && self.no_xapian_reindex == true)
-            xapian_mark_needs_index
-        end
-
-        def xapian_create_job(action, model, model_id)
-            begin
-                ActiveRecord::Base.transaction(:requires_new => true) do
-                    ActsAsXapianJob.delete_all([ "model = ? and model_id = ?", model, model_id])
-                    xapian_before_create_job_hook(action, model, model_id)
-                    ActsAsXapianJob.create!(:model => model,
-                                            :model_id => model_id,
-                                            :action => action)
-                end
-            rescue ActiveRecord::RecordNotUnique => e
-                # Given the error handling in ActsAsXapian::update_index, we can just fail silently if
-                # another process has inserted an acts_as_xapian_jobs record for this model.
-                raise unless (e.message =~ /duplicate key value violates unique constraint "index_acts_as_xapian_jobs_on_model_and_model_id"/)
-            end
-        end
-
-        # A hook method that can be used in tests to simulate e.g. an external process inserting a record
-        def xapian_before_create_job_hook(action, model, model_id)
-        end
-
-     end
-
-    ######################################################################
-    # Main entry point, add acts_as_xapian to your model.
-
-    module ActsMethods
-        # See top of this file for docs
-        def acts_as_xapian(options)
-            # Give error only on queries if bindings not available
-            if not ActsAsXapian.bindings_available
-                return
-            end
-
-            include InstanceMethods
-
-            cattr_accessor :xapian_options
-            self.xapian_options = options
-
-            ActsAsXapian.init(self.class.to_s, options)
-
-            after_save :xapian_mark_needs_index_if_reindex
-            after_destroy :xapian_mark_needs_destroy
-        end
-    end
-
-end
-
-# Reopen ActiveRecord and include the acts_as_xapian method
-ActiveRecord::Base.extend ActsAsXapian::ActsMethods
-
-
diff --git a/vendor/plugins/acts_as_xapian/lib/tasks/xapian.rake b/vendor/plugins/acts_as_xapian/lib/tasks/xapian.rake
deleted file mode 100644
index c1986ce1e..000000000
--- a/vendor/plugins/acts_as_xapian/lib/tasks/xapian.rake
+++ /dev/null
@@ -1,66 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require 'active_record'
-
-namespace :xapian do
-    # Parameters - specify "flush=true" to save changes to the Xapian database
-    # after each model that is updated. This is safer, but slower. Specify
-    # "verbose=true" to print model name as it is run.
-    desc 'Updates Xapian search index with changes to models since last call'
-    task :update_index => :environment do
-        ActsAsXapian.update_index(ENV['flush'] ? true : false, ENV['verbose'] ? true : false)
-    end
-
-    # Parameters - specify 'models="PublicBody User"' to say which models
-    # you index with Xapian.
-
-    # This totally rebuilds the database, so you will want to restart
-    # any web server afterwards to make sure it gets the changes,
-    # rather than still pointing to the old deleted database. Specify
-    # "verbose=true" to print model name as it is run.  By default,
-    # all of the terms, values and texts are reindexed.  You can
-    # suppress any of these by specifying, for example, "texts=false".
-    # You can specify that only certain terms should be updated by
-    # specifying their prefix(es) as a string, e.g. "terms=IV" will
-    # index the two terms I and V (and "terms=false" will index none,
-    # and "terms=true", the default, will index all)
-
-
-    desc 'Completely rebuilds Xapian search index (must specify all models)'
-    task :rebuild_index => :environment do
-        def coerce_arg(arg, default)
-	    if arg == "false"
-	        return false
-            elsif arg == "true"
-                return true
-            elsif arg.nil?
-	        return default
-            else
-                return arg
-            end
-	end
-        raise "specify ALL your models with models=\"ModelName1 ModelName2\" as parameter" if ENV['models'].nil?
-        ActsAsXapian.rebuild_index(ENV['models'].split(" ").map{|m| m.constantize}, 
-	coerce_arg(ENV['verbose'], false),
-        coerce_arg(ENV['terms'], true),
-        coerce_arg(ENV['values'], true),
-        coerce_arg(ENV['texts'], true))
-    end
-
-    # Parameters - are models, query, offset, limit, sort_by_prefix,
-    # collapse_by_prefix
-    desc 'Run a query, return YAML of results'
-    task :query => :environment do
-        raise "specify models=\"ModelName1 ModelName2\" as parameter" if ENV['models'].nil?
-        raise "specify query=\"your terms\" as parameter" if ENV['query'].nil?
-        s = ActsAsXapian::Search.new(ENV['models'].split(" ").map{|m| m.constantize}, 
-            ENV['query'],
-            :offset => (ENV['offset'] || 0), :limit => (ENV['limit'] || 10),
-            :sort_by_prefix => (ENV['sort_by_prefix'] || nil), 
-            :collapse_by_prefix => (ENV['collapse_by_prefix'] || nil)
-        )
-        STDOUT.puts(s.results.to_yaml)
-    end
-end
-