Updating vendored Riddle

vizjerai · Nov 16, 2009 · 07f2728 · 07f2728
1 parent 0a11785
commit 07f2728
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/vendor/riddle/lib/riddle/configuration/index.rb b/vendor/riddle/lib/riddle/configuration/index.rb
@@ -8,7 +8,8 @@ class Index < Riddle::Configuration::Section
         :ngram_len, :ngram_chars, :phrase_boundary, :phrase_boundary_step,
         :html_strip, :html_index_attrs, :html_remove_elements, :preopen,
         :ondisk_dict, :inplace_enable, :inplace_hit_gap, :inplace_docinfo_gap,
-        :inplace_reloc_factor, :inplace_write_factor, :index_exact_words]
+        :inplace_reloc_factor, :inplace_write_factor, :index_exact_words,
+        :overshort_step, :stopwords_step]
 
       attr_accessor :name, :parent, :sources, :path, :docinfo, :mlock,
         :morphologies, :min_stemming_len, :stopword_files, :wordform_files,
@@ -18,7 +19,8 @@ class Index < Riddle::Configuration::Section
         :ngram_characters, :phrase_boundaries, :phrase_boundary_step,
         :html_strip, :html_index_attrs, :html_remove_element_tags, :preopen,
         :ondisk_dict, :inplace_enable, :inplace_hit_gap, :inplace_docinfo_gap,
-        :inplace_reloc_factor, :inplace_write_factor, :index_exact_words
+        :inplace_reloc_factor, :inplace_write_factor, :index_exact_words,
+        :overshort_step, :stopwords_step
 
       def initialize(name, *sources)
         @name                     = name

diff --git a/vendor/riddle/lib/riddle/configuration/indexer.rb b/vendor/riddle/lib/riddle/configuration/indexer.rb
@@ -1,7 +1,8 @@
 module Riddle
   class Configuration
     class Indexer < Riddle::Configuration::Section
-      self.settings = [:mem_limit, :max_iops, :max_iosize]
+      self.settings = [:mem_limit, :max_iops, :max_iosize, :max_xmlpipe2_field,
+        :write_buffer]
 
       attr_accessor *self.settings
 

diff --git a/vendor/riddle/lib/riddle/configuration/searchd.rb b/vendor/riddle/lib/riddle/configuration/searchd.rb
@@ -5,7 +5,8 @@ class Searchd < Riddle::Configuration::Section
         :read_timeout, :client_timeout, :max_children, :pid_file, :max_matches,
         :seamless_rotate, :preopen_indexes, :unlink_old, :attr_flush_period,
         :ondisk_dict_default, :max_packet_size, :mva_updates_pool,
-        :crash_log_path, :max_filters, :max_filter_values]
+        :crash_log_path, :max_filters, :max_filter_values, :listen_backlog,
+        :read_buffer, :read_unhinted]
 
       attr_accessor *self.settings
 

diff --git a/vendor/riddle/lib/riddle/configuration/sql_source.rb b/vendor/riddle/lib/riddle/configuration/sql_source.rb
@@ -2,7 +2,8 @@ module Riddle
   class Configuration
     class SQLSource < Riddle::Configuration::Source
       self.settings = [:type, :sql_host, :sql_user, :sql_pass, :sql_db,
-        :sql_port, :sql_sock, :mysql_connect_flags, :sql_query_pre, :sql_query,
+        :sql_port, :sql_sock, :mysql_connect_flags, :mysql_ssl_cert,
+        :mysql_ssl_key, :mysql_ssl_ca, :odbc_dsn, :sql_query_pre, :sql_query,
         :sql_query_range, :sql_range_step, :sql_query_killlist, :sql_attr_uint,
         :sql_attr_bool, :sql_attr_bigint, :sql_attr_timestamp,
         :sql_attr_str2ordinal, :sql_attr_float, :sql_attr_multi,

diff --git a/vendor/riddle/lib/riddle/configuration/xml_source.rb b/vendor/riddle/lib/riddle/configuration/xml_source.rb
@@ -3,7 +3,8 @@ class Configuration
     class XMLSource < Riddle::Configuration::Source
       self.settings = [:type, :xmlpipe_command, :xmlpipe_field,
         :xmlpipe_attr_uint, :xmlpipe_attr_bool, :xmlpipe_attr_timestamp,
-        :xmlpipe_attr_str2ordinal, :xmlpipe_attr_float, :xmlpipe_attr_multi]
+        :xmlpipe_attr_str2ordinal, :xmlpipe_attr_float, :xmlpipe_attr_multi,
+        :xmlpipe_fixup_utf8]
 
       attr_accessor *self.settings