Changeset 306

Timestamp:

02/02/08 12:35:01 (8 months ago)

Author:

jk

Message:

#189 - allow for per-document analyzers

Files:

• trunk/plugin/acts_as_ferret/lib/bulk_indexer.rb (modified) (1 diff)
• trunk/plugin/acts_as_ferret/lib/instance_methods.rb (modified) (1 diff)
• trunk/plugin/acts_as_ferret/lib/local_index.rb (modified) (1 diff)

trunk/plugin/acts_as_ferret/lib/bulk_indexer.rb

@@ -17 +17 @@
-    def index_records(records, offset)
-      batch_time = measure_time {
- << rec.to_doc
+.add_document(rec.to_doc, rec.ferret_analyzer)
-      }.to_f
-      @work_done = offset.to_f / @model_count * 100.0 if @model_count > 0

trunk/plugin/acts_as_ferret/lib/instance_methods.rb

@@ -49 +49 @@
-    def ferret_enabled?(is_bulk_index = false)
-      @ferret_disabled.nil? && (is_bulk_index || self.class.ferret_enabled?)
+    end
+
+    # Returns the analyzer to use when adding this record to the index.
+    #
+    # Override to return a specific analyzer for any record that is to be
+    # indexed, i.e. specify a different analyzer based on language. Returns nil
+    # by default so the global analyzer (specified with the acts_as_ferret
+    # call) is used.
+    def ferret_analyzer
+      nil
-    end
-

trunk/plugin/acts_as_ferret/lib/local_index.rb

@@ -150 +150 @@
-    # add record to index
-    # record may be the full AR object, a Ferret document instance or a Hash
-
-
-
+
+
+
+
+
+
-    end
-    alias << add