ferret 0.10.6 → 0.10.7

data/ext/store.h

@@ -4,6 +4,7 @@
 #include <sys/types.h>
 #include "global.h"
 #include "hash.h"
+#include "hashset.h"
 #include "threading.h"
 
 #define BUFFER_SIZE 1024
@@ -175,6 +176,8 @@ struct Store
         CompoundStore *cmpd;    /* for compound_store only */
     } dir;
 
+    HashSet *locks;
+
     /**
      * Create the file +filename+ in the +store+.
      *
@@ -299,7 +302,7 @@ struct Store
      * @param store self
      * @param lock the lock to obtain
      */
-    Lock *(*open_lock)(Store *store, char *lockname);
+    Lock *(*open_lock_i)(Store *store, char *lockname);
 
     /**
      * Returns true if +lock+ is locked. To test if the file is locked:wq
@@ -307,7 +310,7 @@ struct Store
      * @param lock the lock to test
      * @raise IO_ERROR if there is an error detecting the lock status
      */
-    void (*close_lock)(Lock *lock);
+    void (*close_lock_i)(Lock *lock);
 
     /**
      * Internal function to close the store freeing implementation specific
@@ -730,4 +733,7 @@ extern void is2os_copy_vints(InStream *is, OutStream *os, int cnt);
  * @paran len the length of the buffer
  */
 extern char *store_to_s(Store *store, char *buf, int buf_size);
+
+extern Lock *open_lock(Store *store, char *lockname);
+extern void close_lock(Lock *lock);
 #endif

data/lib/ferret/index.rb

@@ -57,6 +57,10 @@ module Ferret::Index
     #                         long to wait before retrying to obtain the
     #                         commit lock when detecting if the IndexReader is
     #                         at the latest version.
+    # close_dir::             Default: false.  If you explicitly pass a
+    #                         Directory object to this class and you want
+    #                         Index to close it when it is closed itself then
+    #                         set this to true.
     # 
     # Some examples;
     #
@@ -86,10 +90,12 @@ module Ferret::Index
         end
       end
 
+      @close_dir = options[:close_dir]
       if options[:dir].is_a?(String)
         options[:path] = options[:dir]
       end
       if options[:path]
+        @close_dir = true
         begin
           @dir = FSDirectory.new(options[:path], options[:create])
         rescue IOError => io
@@ -99,6 +105,7 @@ module Ferret::Index
         @dir = options[:dir]
       else
         options[:create] = true # this should always be true for a new RAMDir
+        @close_dir = true
         @dir = RAMDirectory.new
       end
 
@@ -116,7 +123,7 @@ module Ferret::Index
         @writer = nil
         @reader = nil
 
-        @options.delete(:create) # only want to create the first time if at all
+        @options.delete(:create) # only create the first time if at all
         @auto_flush = @options[:auto_flush] || false
         if (@options[:id_field].nil? and
             @key.is_a?(Symbol))
@@ -183,7 +190,7 @@ module Ferret::Index
         @searcher.close() if @searcher
         @reader.close() if @reader
         @writer.close() if @writer
-        @dir.close()
+        @dir.close() if @close_dir
 
         @open = false
       end
@@ -683,8 +690,11 @@ module Ferret::Index
           if @qp.nil?
             @qp = Ferret::QueryParser.new(@options)
           end
-          # we need to set this ever time, in case a new field has been added
-          @qp.fields = @reader.field_names unless options[:all_fields]
+          # we need to set this every time, in case a new field has been added
+          @qp.fields =
+              @reader.fields unless options[:all_fields] || options[:fields]
+          @qp.tokenized_fields =
+              @reader.tokenized_fields unless options[:tokenized_fields]
           query = @qp.parse(query)
         end
         return query

data/lib/ferret_version.rb

@@ -1,3 +1,3 @@
 module Ferret
-  VERSION = '0.10.6'
+  VERSION = '0.10.7'
 end

data/test/test_helper.rb

@@ -2,6 +2,9 @@ $:.unshift File.dirname(__FILE__)
 $:.unshift File.join(File.dirname(__FILE__), '../lib')
 $:.unshift File.join(File.dirname(__FILE__), '../ext')
 
+ENV['LANG'] = "en_US.UTF-8"
+ENV['LC_CTYPE'] = "en_US.UTF-8"
+
 class Float
   def approx_eql?(o)
     return (1 - self/o).abs < 0.0001

data/test/unit/analysis/tc_analyzer.rb

@@ -38,7 +38,7 @@ class AnalyzerTest < Test::Unit::TestCase
     assert_equal(Token.new("ADDRESS", 39, 46), t.next())
     assert(! t.next())
   end
-end if Ferret.locale.downcase.index("utf")
+end if (/mswin/i !~ RUBY_PLATFORM)
 
 class AsciiLetterAnalyzerTest < Test::Unit::TestCase
   include Ferret::Analysis
@@ -131,7 +131,7 @@ class LetterAnalyzerTest < Test::Unit::TestCase
     assert_equal(Token.new("öîí", 80, 86), t.next)
     assert(! t.next())
   end
-end if Ferret.locale.downcase.index("utf")
+end if (/mswin/i !~ RUBY_PLATFORM)
 
 class AsciiWhiteSpaceAnalyzerTest < Test::Unit::TestCase
   include Ferret::Analysis
@@ -214,7 +214,7 @@ class WhiteSpaceAnalyzerTest < Test::Unit::TestCase
     assert_equal(Token.new('áägç®êëì¯úøã¬öîí', 55, 86), t.next)
     assert(! t.next())
   end
-end if Ferret.locale.downcase.index("utf")
+end if (/mswin/i !~ RUBY_PLATFORM)
 
 class AsciiStandardAnalyzerTest < Test::Unit::TestCase
   include Ferret::Analysis
@@ -350,7 +350,7 @@ class StandardAnalyzerTest < Test::Unit::TestCase
     assert_equal(Token.new('öîí', 142, 148), t2.next)
     assert(! t2.next())
   end
-end if Ferret.locale.downcase.index("utf")
+end if (/mswin/i !~ RUBY_PLATFORM)
 
 class PerFieldAnalyzerTest < Test::Unit::TestCase
   include Ferret::Analysis
@@ -545,4 +545,4 @@ class CustomAnalyzerTest < Test::Unit::TestCase
     assert_equal(Token.new("dêbater", 36, 44), t.next)
     assert(! t.next())
   end
-end if Ferret.locale.downcase.index("utf")
+end if (/mswin/i !~ RUBY_PLATFORM)

data/test/unit/analysis/tc_token_stream.rb

@@ -109,7 +109,7 @@ class LetterTokenizerTest < Test::Unit::TestCase
     assert_equal(Token.new('öîí', 80, 86), t.next)
     assert(! t.next())
   end
-end if Ferret.locale.downcase.index("utf")
+end if (/mswin/i !~ RUBY_PLATFORM)
 
 class AsciiWhiteSpaceTokenizerTest < Test::Unit::TestCase
   include Ferret::Analysis
@@ -186,7 +186,7 @@ class WhiteSpaceTokenizerTest < Test::Unit::TestCase
     assert_equal(Token.new('áägç®êëì¯úøã¬öîí', 55, 86), t.next)
     assert(! t.next())
   end
-end if Ferret.locale.downcase.index("utf")
+end if (/mswin/i !~ RUBY_PLATFORM)
 
 class AsciiStandardTokenizerTest < Test::Unit::TestCase
   include Ferret::Analysis
@@ -275,7 +275,7 @@ class StandardTokenizerTest < Test::Unit::TestCase
     assert_equal(Token.new('www.davebalmain.com/trac-site', 25, 61), t.next)
     assert(! t.next())
   end
-end if Ferret.locale.downcase.index("utf")
+end if (/mswin/i !~ RUBY_PLATFORM)
 
 class RegExpTokenizerTest < Test::Unit::TestCase
   include Ferret::Analysis

data/test/unit/index/tc_index_writer.rb

@@ -11,7 +11,7 @@ class IndexWriterTest < Test::Unit::TestCase
     fis.create_index(@dir)
   end
 
-  def tear_down()
+  def teardown()
     @dir.close()
   end
 

data/test/unit/query_parser/tc_query_parser.rb

@@ -5,7 +5,8 @@ class QueryParserTest < Test::Unit::TestCase
 
   def test_strings()
     parser = Ferret::QueryParser.new(:default_field => "xxx",
-                                     :fields => ["xxx", "field", "f1", "f2"])
+                                     :fields => ["xxx", "field", "f1", "f2"],
+                                     :tokenized_fields => ["xxx", "f1", "f2"])
     pairs = [
       ['', ''],
       ['*:word', 'word field:word f1:word f2:word'],
@@ -14,12 +15,13 @@ class QueryParserTest < Test::Unit::TestCase
       ['"word1 word2 word#"', '"word1 word2 word"'],
       ['"word1 %%% word3"', '"word1 <> word3"~1'],
       ['field:"one two three"', 'field:"one two three"'],
-      ['field:"one %%% three"', 'field:"one <> three"~1'],
+      ['field:"one %%% three"', 'field:"one %%% three"'],
+      ['f1:"one %%% three"', 'f1:"one <> three"~1'],
       ['field:"one <> three"', 'field:"one <> three"'],
       ['field:"one <> three <>"', 'field:"one <> three"'],
       ['field:"one <> <> <> three <>"', 'field:"one <> <> <> three"'],
-      ['field:"one <> <> <> three|four|five <>"', 'field:"one <> <> <> three|four|five"'],
-      ['field:"one|two three|four|five six|seven"', 'field:"one|two three|four|five six|seven"'],
+      ['field:"one <> 222 <> three|four|five <>"', 'field:"one <> 222 <> three|four|five"'],
+      ['field:"on1|tw2 THREE|four|five six|seven"', 'field:"on1|tw2 THREE|four|five six|seven"'],
       ['field:"testing|trucks"', 'field:testing field:trucks'],
       ['[aaa bbb]', '[aaa bbb]'],
       ['{aaa bbb]', '{aaa bbb]'],
@@ -27,7 +29,7 @@ class QueryParserTest < Test::Unit::TestCase
       ['{aaa bbb}', '{aaa bbb}'],
       ['{aaa>', '{aaa>'],
       ['[aaa>', '[aaa>'],
-      ['field:<aaa}', 'field:<aaa}'],
+      ['field:<a\ aa}', 'field:<a aa}'],
       ['<aaa]', '<aaa]'],
       ['>aaa', '{aaa>'],
       ['>=aaa', '[aaa>'],

data/test/unit/search/tc_filter.rb

@@ -26,7 +26,7 @@ class FilterTest < Test::Unit::TestCase
     iw.close
   end
 
-  def tear_down()
+  def teardown()
     @dir.close()
   end
 

data/test/unit/search/tc_fuzzy_query.rb

@@ -14,7 +14,7 @@ class FuzzyQueryTest < Test::Unit::TestCase
     @dir = RAMDirectory.new()
   end
 
-  def tear_down()
+  def teardown()
     @dir.close()
   end
 

data/test/unit/search/tc_index_searcher.rb

@@ -20,7 +20,7 @@ class SearcherTest < Test::Unit::TestCase
     @searcher = Searcher.new(@dir)
   end
 
-  def tear_down()
+  def teardown()
     @searcher.close
     @dir.close()
   end

data/test/unit/search/tc_multi_searcher.rb

@@ -97,7 +97,7 @@ class MultiSearcherTest < Test::Unit::TestCase
     #@query_parser = Ferret::QueryParser.new([:date, :field, :cat], :analyzer => WhiteSpaceAnalyzer.new())
   end
 
-  def tear_down()
+  def teardown()
     @searcher.close
     @single.close
   end

data/test/unit/search/tc_search_and_sort.rb

@@ -30,7 +30,7 @@ class SearchAndSortTest < Test::Unit::TestCase
     iw.close
   end
 
-  def tear_down()
+  def teardown()
     @dir.close()
   end
 

data/test/unit/search/tc_spans.rb

@@ -52,7 +52,7 @@ class SpansBasicTest < Test::Unit::TestCase
     @searcher = Searcher.new(@dir)
   end
 
-  def tear_down()
+  def teardown()
     @searcher.close
     @dir.close
   end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: ferret
 version: !ruby/object:Gem::Version 
-  version: 0.10.6
-date: 2006-09-21 00:00:00 +09:00
+  version: 0.10.7
+date: 2006-09-24 00:00:00 +09:00
 summary: Ruby indexing library.
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - David Balmain
 files: