ferret 0.9.3 → 0.9.4

data/ext/ferret.c

@@ -1,6 +1,7 @@
 #include "ferret.h"
 #include "except.h"
 #include "hash.h"
+#include "hashset.h"
 
 /* Object Map */
 static HshTable *object_map;
@@ -8,6 +9,9 @@ static HshTable *object_map;
 /* IDs */
 ID id_new;
 ID id_call;
+ID id_is_directory;
+
+static ID id_mkdir_p;
 
 /* Modules */
 VALUE mFerret;
@@ -129,6 +133,26 @@ frt_thread_getspecific(thread_key_t key)
   return h_get(key, (void *)rb_thread_current());
 }
 
+void
+frt_create_dir(VALUE rpath)
+{
+  VALUE mFileUtils;
+  rb_require("fileutils");
+  mFileUtils = rb_define_module("FileUtils");
+  rb_funcall(mFileUtils, id_mkdir_p, 1, rpath);
+}
+
+VALUE
+frt_hs_to_rb_ary(HashSet *hs)
+{
+  int i;
+  VALUE ary = rb_ary_new();
+  for (i = 0; i < hs->size; i++) {
+    rb_ary_push(ary, rb_str_new2(hs->elems[i]));
+  }
+  return ary;
+}
+
 void
 Init_ferret_ext(void)
 {
@@ -139,6 +163,9 @@ Init_ferret_ext(void)
 	id_new = rb_intern("new");
 	id_call = rb_intern("call");
 
+  id_mkdir_p = rb_intern("mkdir_p");
+  id_is_directory = rb_intern("directory?");
+
   /* Modules */
   mFerret = rb_define_module("Ferret");
   mAnalysis = rb_define_module_under(mFerret, "Analysis");

data/ext/ferret.h

@@ -2,11 +2,13 @@
 #define __FERRET_H_
 
 #include "global.h"
+#include "hashset.h"
 #include "document.h"
 
 /* IDs */
 extern ID id_new;
 extern ID id_call;
+extern ID id_is_directory;
 
 /* Modules */
 extern VALUE mFerret;
@@ -44,7 +46,8 @@ extern VALUE object_get(void *key);
 extern VALUE frt_data_alloc(VALUE klass);
 extern VALUE frt_get_doc(Document *doc);
 extern void frt_deref_free(void *p);
-
+extern void frt_create_dir(VALUE rpath);
+extern VALUE frt_hs_to_rb_ary(HashSet *hs);
 
 #define Frt_Make_Struct(klass)\
   rb_data_object_alloc(klass,NULL,(RUBY_DATA_FUNC)NULL,(RUBY_DATA_FUNC)NULL)

data/ext/field.c

@@ -270,17 +270,20 @@ void fw_add_doc(FieldsWriter *fw, Document *doc)
       os_write_vint(fout, ((FieldInfo *)ht_get(fw->fis->by_name, df->name))->number);
 
       bits = 0;
-      if (df->is_tokenized)
+      if (df->is_tokenized) {
         bits |= FIELD_IS_TOKENIZED;
-      if (df->is_binary)
+      }
+      if (df->is_binary) {
         bits |= FIELD_IS_BINARY;
-      if (df->is_compressed)
+      }
+      if (df->is_compressed) {
         bits |= FIELD_IS_COMPRESSED;
+      }
       os_write_byte(fout, bits);
       
       data = NULL;
       if (df->is_compressed) {
-        // Not compressing just yet but we'll save it anyway
+        /* Not compressing just yet but we'll save it anyway */
         if (df->is_binary) {
           save_data(fout, df->data, df->blen);
         } else {

data/ext/hash.c

@@ -204,10 +204,6 @@ HshEntry *h_lookup_str(HshTable *ht, register const void *key_p)
     if (he->key == dummy_key && freeslot == NULL)
       freeslot = he;
   }
-  if (he->key == NULL || he->key == key) {
-    he->hash = hash;
-    return he;
-  }
 }
 
 typedef int (*eq_func)(const void *key1, const void *key2);

data/ext/inc/lang.h

@@ -25,7 +25,7 @@ extern void setprogname(const char *str);
 
 extern VALUE cQueryParseException;
 
-#define EXCEPTION_CODE rb_eException
+#define EXCEPTION_CODE rb_eStandardError
 //#define IO_ERROR rb_eIOError
 //#define ARG_ERROR rb_eArgError
 //#define EOF_ERROR rb_eEOFError

data/ext/ind.c

@@ -327,8 +327,8 @@ Document *index_get_doc_term(Index *self, Term *term)
   tde = ir_term_docs_for(self->ir, term);
   if (tde->next(tde)) {
     doc = index_get_doc(self, tde->doc_num(tde));
-    tde->close(tde);
   }
+  tde->close(tde);
   mutex_unlock(&self->store->ext_mutex);
   return doc;
 }

data/ext/lang.h

@@ -25,7 +25,7 @@ extern void setprogname(const char *str);
 
 extern VALUE cQueryParseException;
 
-#define EXCEPTION_CODE rb_eException
+#define EXCEPTION_CODE rb_eStandardError
 //#define IO_ERROR rb_eIOError
 //#define ARG_ERROR rb_eArgError
 //#define EOF_ERROR rb_eEOFError

data/ext/nix_io.c

@@ -2,7 +2,6 @@
 
 #include "global.h"
 #include "store.h"
-#include <sys/dir.h>
 #include <dirent.h>
 #include <unistd.h>
 #include <string.h>
@@ -41,7 +40,7 @@ int fcount(char *path)
   if (!d) RAISE(IO_ERROR, strerror(errno));
 
   while ((de = readdir(d)) != NULL) {
-    if (de->d_name[0] != '.') {
+    if ((de->d_name[0] != '\0') && (de->d_name[0] != '.')) {
       cnt++;
     }
   }
@@ -58,7 +57,8 @@ void dir_each(char *path, void (*func)(char *fname, void *arg), void *arg)
   if (!d) RAISE(IO_ERROR, strerror(errno));
 
   while ((de = readdir(d)) != NULL) {
-    if (de->d_name[0] != '.' && !file_is_lock(de->d_name)) {
+    if ((de->d_name[0] != '\0') && (de->d_name[0] != '.')
+        && !file_is_lock(de->d_name)) {
       func(de->d_name, arg);
     }
   }
@@ -101,7 +101,8 @@ void fs_clear(Store *store)
   if (!d) RAISE(IO_ERROR, strerror(errno));
 
   while ((de = readdir(d)) != NULL) {
-    if (de->d_name[0] != '.' && !file_is_lock(de->d_name)) {
+    if ((de->d_name[0] != '\0') && (de->d_name[0] != '.')
+        && !file_is_lock(de->d_name)) {
       char buf[MAX_FILE_PATH];
       remove(join_path(buf, store->dir.path, de->d_name));
     }
@@ -123,7 +124,7 @@ void fs_clear_all(Store *store)
   if (!d) RAISE(IO_ERROR, strerror(errno));
 
   while ((de = readdir(d)) != NULL) {
-    if (de->d_name[0] != '.') {
+    if ((de->d_name[0] != '\0') && (de->d_name[0] != '.')) {
       char buf[MAX_FILE_PATH];
       remove(join_path(buf, store->dir.path, de->d_name));
     }

data/ext/r_analysis.c

@@ -1152,6 +1152,7 @@ Init_analysis(void)
       frt_per_field_analyzer_add_field, 2);
   rb_define_method(cPerFieldAnalyzer, "[]=",
       frt_per_field_analyzer_add_field, 2);
+  rb_define_class_under(mAnalysis, "PerFieldAnalyzerWrapper", cPerFieldAnalyzer);
 
   /*** * * RegexAnalyzer * * ***/
   cRegExpAnalyzer =

data/ext/r_doc.c

@@ -288,7 +288,7 @@ frt_get_doc(Document *doc)
   if (!doc || (self = object_get(doc)) != Qnil) return self;
 
   doc->free_data = NULL;
-  self = Data_Wrap_Struct(cDocument, &frt_doc_mark, &frt_doc_free, doc);
+  self = Data_Wrap_Struct(cDocument, frt_doc_mark, frt_doc_free, doc);
 
   /* We add all the document's fields to the ruby object space so that they
    * can be retrieved in ruby later. This code must come after the above

data/ext/r_index_io.c

@@ -442,6 +442,7 @@ frt_iw_init(int argc, VALUE *argv, VALUE self)
       ref(store);
     } else {
       StringValue(rdir);
+      frt_create_dir(rdir);
       store = open_fs_store(RSTRING(rdir)->ptr);
     }
   } else {
@@ -645,6 +646,7 @@ frt_ir_init(int argc, VALUE *argv, VALUE self)
         store = DATA_PTR(rdir);
       } else {
         rdir = rb_obj_as_string(rdir);
+        frt_create_dir(rdir);
         store = open_fs_store(RSTRING(rdir)->ptr);
         deref(store);
       }
@@ -871,6 +873,17 @@ frt_ir_terms_from(VALUE self, VALUE rterm)
   return Data_Wrap_Struct(cTermEnum, NULL, &frt_te_free, te);
 }
 
+static VALUE
+frt_ir_get_field_names(VALUE self)
+{
+  GET_IR;
+  VALUE rfnames;
+  HashSet *fnames = ir->get_field_names(ir, IR_ALL);
+  rfnames = frt_hs_to_rb_ary(fnames);
+  hs_destroy(fnames);
+  return rfnames;
+}
+
 /****************************************************************************
  *
  * Init Function
@@ -1004,4 +1017,5 @@ Init_index_io(void)
   rb_define_method(cIndexReader, "doc_freq", frt_ir_doc_freq, 1);
   rb_define_method(cIndexReader, "terms", frt_ir_terms, 0);
   rb_define_method(cIndexReader, "terms_from", frt_ir_terms_from, 1);
+  rb_define_method(cIndexReader, "get_field_names", frt_ir_get_field_names, 0);
 }

data/ext/r_qparser.c

@@ -10,6 +10,7 @@ VALUE rwild_lower_key;
 VALUE roccur_default_key;
 VALUE rdefault_slop_key;
 VALUE rclean_str_key;
+VALUE rfields_key;
 extern VALUE ranalyzer_key;
 
 extern VALUE frt_get_analyzer(Analyzer *a);
@@ -90,6 +91,12 @@ frt_qp_init(int argc, VALUE *argv, VALUE self)
     if (Qnil != (rval = rb_hash_aref(roptions, ranalyzer_key))) {
       analyzer = frt_get_cwrapped_analyzer(rval);
     }
+    if (Qnil != (rval = rb_hash_aref(roptions, rfields_key))) {
+      all_fields = frt_get_fields(rval);
+    }
+  }
+  if (all_fields == NULL) {
+    all_fields = hs_str_create(&free);
   }
 
   if (!analyzer) {
@@ -125,7 +132,7 @@ frt_qp_init(int argc, VALUE *argv, VALUE self)
   return self;
 }
 
-#define GET_QP QParser *qp; Data_Get_Struct(self, QParser, qp)
+#define GET_QP QParser *qp = (QParser *)DATA_PTR(self)
 static VALUE
 frt_qp_parse(VALUE self, VALUE rstr)
 {
@@ -148,6 +155,36 @@ frt_qp_parse(VALUE self, VALUE rstr)
   return rq;
 }
 
+static VALUE
+frt_qp_get_fields(VALUE self)
+{
+  GET_QP;
+  int i;
+  HashSet *fields = qp->all_fields;
+  VALUE rfields = rb_ary_new();
+
+  for (i = 0; i < fields->size; i++) {
+    rb_ary_push(rfields, rb_str_new2((char *)fields->elems[i]));
+  } 
+
+  return rfields;
+}
+
+static VALUE
+frt_qp_set_fields(VALUE self, VALUE rfields)
+{
+  GET_QP;
+  HashSet *fields = frt_get_fields(rfields);
+
+  if (fields == NULL) {
+    fields = hs_str_create(&free);
+  }
+  hs_destroy(qp->all_fields);
+  qp->all_fields = fields;
+
+  return self;
+}
+
 /****************************************************************************
  *
  * Init function
@@ -164,6 +201,7 @@ Init_qparser(void)
   roccur_default_key = ID2SYM(rb_intern("occur_default"));
   rdefault_slop_key = ID2SYM(rb_intern("default_slop"));
   rclean_str_key = ID2SYM(rb_intern("clean_string"));
+  rfields_key = ID2SYM(rb_intern("fields"));
 
   /* QueryParser */
   cQueryParser = rb_define_class_under(mFerret, "QueryParser", rb_cObject);
@@ -171,6 +209,8 @@ Init_qparser(void)
 
   rb_define_method(cQueryParser, "initialize", frt_qp_init, -1);
   rb_define_method(cQueryParser, "parse", frt_qp_parse, 1);
+  rb_define_method(cQueryParser, "fields", frt_qp_get_fields, 0);
+  rb_define_method(cQueryParser, "fields=", frt_qp_set_fields, 1);
 
   /* QueryParseException */
   cQueryParseException = rb_define_class_under(cQueryParser,

data/ext/r_search.c

@@ -110,7 +110,7 @@ frt_get_sd(Hit *hit)
   return self;
 }
 
-#define GET_HIT Hit *hit; Data_Get_Struct(self, Hit, hit)
+#define GET_HIT Hit *hit = (Hit *)DATA_PTR(self)
 static VALUE
 frt_sd_score(VALUE self)
 {
@@ -1423,6 +1423,7 @@ frt_sea_close(VALUE self)
 {
   GET_SEA;
   Frt_Unwrap_Struct(self);
+  object_del(sea);
   sea->close(sea);
   return Qnil;
 }
@@ -1561,6 +1562,7 @@ frt_is_init(VALUE self, VALUE obj)
   IndexReader *ir = NULL;
   Searcher *sea;
   if (TYPE(obj) == T_STRING) {
+    frt_create_dir(obj);
     store = open_fs_store(StringValueCStr(obj));
     ir = ir_open(store);
     deref(store);
@@ -1698,6 +1700,7 @@ frt_ind_init(int argc, VALUE *argv, VALUE self)
     if (Qnil != (rval = rb_hash_aref(roptions, rpath_key))) {
       rval = rb_obj_as_string(rval);
       /* TODO: create the directory if it is missing */
+      frt_create_dir(rval);
       store = open_fs_store(RSTRING(rval)->ptr);
       deref(store);
     } else if (Qnil != (rval = rb_hash_aref(roptions, rdir_key))) {
@@ -2329,6 +2332,7 @@ frt_ind_persist(int argc, VALUE *argv, VALUE self)
     ref(ind->store);
   } else {
     rdir = rb_obj_as_string(rdir);
+    frt_create_dir(rdir);
     ind->store = open_fs_store(RSTRING(rdir)->ptr);
   }
 

data/ext/r_store.c

@@ -6,10 +6,6 @@ VALUE cDirectory;
 VALUE cRAMDirectory;
 VALUE cFSDirectory;
 
-
-static ID id_mkdir_p;
-static ID id_is_directory;
-
 /****************************************************************************
  *
  * Lock Methods
@@ -217,10 +213,7 @@ frt_fsdir_new(VALUE klass, VALUE rpath, VALUE rcreate)
   bool create = RTEST(rcreate);
   rpath = rb_obj_as_string(rpath);
   if (create) {
-    VALUE mFileUtils;
-    rb_require("fileutils");
-    mFileUtils = rb_define_module("FileUtils");
-    rb_funcall(mFileUtils, id_mkdir_p, 1, rpath);
+    frt_create_dir(rpath);
   }
   if (!rb_funcall(rb_cFile, id_is_directory, 1, rpath)) {
     rb_raise(rb_eIOError, "There is no directory: %s. Use create = true to "
@@ -246,9 +239,6 @@ frt_fsdir_new(VALUE klass, VALUE rpath, VALUE rcreate)
 void
 Init_dir(void)
 {
-  id_mkdir_p = rb_intern("mkdir_p");
-  id_is_directory = rb_intern("directory?");
-
   cLock = rb_define_class_under(mStore, "Lock", rb_cObject);
   rb_define_method(cLock, "obtain", frt_lock_obtain, -1);
   rb_define_method(cLock, "while_locked", frt_lock_while_locked, -1);

data/lib/ferret.rb

@@ -22,7 +22,7 @@
 #++
 # :include: ../TUTORIAL
 module Ferret
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end
 
 # try and load the C extension but it isn't necessary.

data/lib/ferret/index/field_infos.rb

@@ -97,7 +97,7 @@ module Ferret
       # Returns the number of the field that goes by the field name that is
       # passed. If there is no field of this name then -1 is returned
       def field_number(name)
-        fi = @fi_hash[name]
+        fi = @fi_hash[name.to_s]
         return fi ? fi.number : NOT_A_FIELD
       end
 
@@ -109,7 +109,7 @@ module Ferret
           end
           return @fi_array[index]
         else
-          return @fi_hash[index]
+          return @fi_hash[index.to_s]
         end
       end
 

data/lib/ferret/index/index_writer.rb

@@ -356,7 +356,7 @@ module Index
         target_merge_docs = @min_merge_docs
         while (target_merge_docs <= @max_merge_docs)
           # find segments smaller than current target size
-          min_segment = @segment_infos.size() -1
+          min_segment = @segment_infos.size() - 1
           merge_docs = 0
           while (min_segment >= 0)
             si = @segment_infos[min_segment]
@@ -383,7 +383,8 @@ module Index
         segments_to_delete = []
         merged_name = new_segment_name()
         if @info_stream != nil
-          @info_stream.print("merging segments from #{min_segment} to #{(max_segment - 1)}\n")
+          @info_stream.print("merging segments from #{min_segment} " +
+                             "to #{(max_segment - 1)}\n")
         end
         merger = SegmentMerger.new(@directory, merged_name, @term_index_interval)
 

data/lib/ferret/index/segment_merger.rb

@@ -40,7 +40,9 @@ module Ferret::Index
       return @readers[i]
     end
 
-    # Merges the readers specified by the @link #addendmethod into the directory passed to the constructor
+    # Merges the readers specified by the #add method into the directory
+    # passed to the constructor
+    # 
     # returns:: The number of documents that were merged
     # raises:: IOError
     def merge()
@@ -51,8 +53,9 @@ module Ferret::Index
       return value
     end
     
-    # close all IndexReaders that have been added.
-    # Should not be called before merge().
+    # close all IndexReaders that have been added.  Should not be called
+    # before merge().
+    #
     # raises:: IOError
     def close_readers()
       @readers.each { |reader| reader.close }

data/lib/ferret/index/term_vectors_io.rb

@@ -341,6 +341,7 @@ module Ferret::Index
     # raises:: IOException if there is an error reading the term vector files
     def get_field_tv(doc_num, field)
       # Check if no term vectors are available for this segment at all
+      field = field.to_s
       field_number = @field_infos.field_number(field)
       result = nil
       if (@tvx != nil) 

data/lib/rferret.rb

@@ -23,7 +23,7 @@ $: << File.dirname(__FILE__)
 #++
 # :include: ../TUTORIAL
 module Ferret
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end
 
 $ferret_pure_ruby = true

data/test/unit/index/tc_index_reader.rb

@@ -6,6 +6,7 @@ module IndexReaderCommon
   include Ferret::Analysis
 
   def test_index_reader
+    do_test_get_field_names()
 
     do_test_term_doc_enum()
     
@@ -18,6 +19,17 @@ module IndexReaderCommon
     do_test_term_enum()
   end
 
+  def do_test_get_field_names()
+    field_names = @ir.get_field_names
+
+    assert(field_names.include?("body"))
+    assert(field_names.include?("changing_field"))
+    assert(field_names.include?("author"))
+    assert(field_names.include?("title"))
+    assert(field_names.include?("text"))
+    assert(field_names.include?("year"))
+  end
+
   def do_test_term_enum()
     te = @ir.terms
 
@@ -192,7 +204,7 @@ module IndexReaderCommon
   end
 
   def do_test_term_vectors()
-    tv = @ir.get_term_vector(3, "body")
+    tv = @ir.get_term_vector(3, :body)
 
     assert_equal("body", tv.field)
     assert_equal(["word1", "word2", "word3", "word4"], tv.terms)
@@ -635,8 +647,8 @@ class IndexReaderTest < Test::Unit::TestCase
   end
 
   def test_ir_read_while_optimizing_on_disk()
-    dpath = File.join(File.dirname(__FILE__),
-                       '../../temp/fsdir')
+    dpath = File.expand_path(File.join(File.dirname(__FILE__),
+                       '../../temp/fsdir'))
     fs_dir = Ferret::Store::FSDirectory.new(dpath, true)
 
     iw = IndexWriter.new(fs_dir, :analyzer => WhiteSpaceAnalyzer.new(), :create => true)
@@ -660,8 +672,8 @@ class IndexReaderTest < Test::Unit::TestCase
   end
 
   def test_latest()
-    dpath = File.join(File.dirname(__FILE__),
-                       '../../temp/fsdir')
+    dpath = File.expand_path(File.join(File.dirname(__FILE__),
+                       '../../temp/fsdir'))
     fs_dir = Ferret::Store::FSDirectory.new(dpath, true)
 
     iw = IndexWriter.new(fs_dir, :analyzer => WhiteSpaceAnalyzer.new(), :create => true)

data/test/unit/query_parser/tc_query_parser.rb

@@ -6,6 +6,7 @@ class QueryParserTest < Test::Unit::TestCase
     parser = Ferret::QueryParser.new("xxx", :fields => ["xxx", "field", "f1", "f2"])
     pairs = [
       ['', ''],
+      ['*:word', 'word field:word f1:word f2:word'],
       ['word', 'word'],
       ['field:word', 'field:word'],
       ['"word1 word2 word#"', '"word1 word2 word"'],
@@ -112,6 +113,39 @@ class QueryParserTest < Test::Unit::TestCase
     pairs.each do |query_str, expected|
       assert_equal(expected, parser.parse(query_str).to_s("xxx"))
     end
+
+  end
+
+  if not $ferret_pure_ruby
+    def test_qp_changing_fields()
+      parser = Ferret::QueryParser.new("xxx", :fields => ["xxx", "key"],
+                     :analyzer => Ferret::Analysis::WhiteSpaceAnalyzer.new)
+      assert_equal('word key:word', parser.parse("*:word").to_s("xxx"))
+
+      parser.fields = ["xxx", "one", "two", "three"]
+      assert_equal('word one:word two:word three:word',
+                   parser.parse("*:word").to_s("xxx"))
+      assert_equal('three:word four:word',
+                   parser.parse("three:word four:word").to_s("xxx"))
+    end
+
+    def test_qp_allow_any_field()
+      parser = Ferret::QueryParser.new("xxx", :fields => ["xxx", "key"],
+                     :analyzer => Ferret::Analysis::WhiteSpaceAnalyzer.new,
+                     :allow_any_fields => false)
+
+      assert_equal('key:word',
+                   parser.parse("key:word song:word").to_s("xxx"))
+      assert_equal('word key:word', parser.parse("*:word").to_s("xxx"))
+
+
+      parser = Ferret::QueryParser.new("xxx", :fields => ["xxx", "key"],
+                     :analyzer => Ferret::Analysis::WhiteSpaceAnalyzer.new)
+
+      assert_equal('key:word song:word',
+                   parser.parse("key:word song:word").to_s("xxx"))
+      assert_equal('word key:word song:word', parser.parse("*:word").to_s("xxx"))
+    end
   end
   
   def do_test_query_parse_exception_raised(str)
@@ -123,7 +157,7 @@ class QueryParserTest < Test::Unit::TestCase
 
   def test_prefix_query
     parser = Ferret::QueryParser.new("xxx", :fields => ["xxx"],
-                                     :analyzer => Ferret::Analysis::StandardAnalyzer.new)
+                   :analyzer => Ferret::Analysis::StandardAnalyzer.new)
     assert_equal(Ferret::Search::PrefixQuery, parser.parse("asdg*").class)
     assert_equal(Ferret::Search::WildcardQuery, parser.parse("a?dg*").class)
     assert_equal(Ferret::Search::WildcardQuery, parser.parse("a*dg*").class)

data/test/unit/search/tc_search_and_sort.rb

@@ -142,9 +142,11 @@ class SearchAndSortTest < Test::Unit::TestCase
     do_test_top_docs(is, q, [0,9,1,8,2,7,3,6,4,5], Sort.new("string"))
     do_test_top_docs(is, q, [3,2,7,4,8,5,9,1,6,0], Sort.new(["int"]))
     do_test_top_docs(is, q, [9,6,4,2,0,1,3,5,7,8], Sort.new("float"))
+    do_test_top_docs(is, q, [9,6,4,2,0,1,3,5,7,8], "float")
     do_test_top_docs(is, q, [8,7,5,3,1,0,2,4,6,9], Sort.new("float", true))
     do_test_top_docs(is, q, [0,6,1,5,9,4,8,7,2,3], Sort.new(["int", "string"], true))
     do_test_top_docs(is, q, [3,2,7,8,4,9,5,1,6,0], Sort.new(["int", "string"]))
+    do_test_top_docs(is, q, [3,2,7,8,4,9,5,1,6,0], ["int", "string"])
   end
 
   #LENGTH = SortField::SortType.new("length", lambda{|str| str.length})

data/test/unit/store/tc_fs_store.rb

@@ -7,11 +7,9 @@ class FSStoreTest < Test::Unit::TestCase
   include StoreTest
   include StoreLockTest
   def setup
-    @dpath = File.join(File.dirname(__FILE__),
-                       '../../temp/fsdir')
+    @dpath = File.expand_path(File.join(File.dirname(__FILE__),
+                       '../../temp/fsdir'))
     @dir = FSDirectory.new(@dpath, true)
-    @dir1 = FSDirectory.new(@dpath, true)
-    @dir2 = FSDirectory.new(@dpath, true)
   end
 
   def teardown

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ferret
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
-date: 2006-05-11 00:00:00 +09:00
+  version: 0.9.4
+date: 2006-07-01 00:00:00 +09:00
 summary: Ruby indexing library.
 require_paths: 
 - lib
@@ -51,6 +51,7 @@ files:
 - ext/document.c
 - ext/compound_io.c
 - ext/index_rw.c
+- ext/termdocs.c
 - ext/vector.c
 - ext/field.c
 - ext/term.c
@@ -368,7 +369,6 @@ files:
 - test/utils/number_to_spoken.rb
 - test/unit/analysis/data/wordfile
 - rake_utils/code_statistics.rb
-- ext/termdocs.c
 test_files: []
 
 rdoc_options: