ferret 0.9.1 → 0.9.2

data/ext/r_doc.c

@@ -32,14 +32,18 @@ frt_field_alloc(VALUE klass)
   return self;
 }
 
-#define GET_DF DocField *df; Data_Get_Struct(self, DocField, df)
+#define GET_DF DocField *df = (DocField *)DATA_PTR(self)
+
 static VALUE
 frt_field_init(int argc, VALUE *argv, VALUE self)
 {
   GET_DF;
   VALUE rname, rdata, rstored, rindexed, rstore_tv, rbinary, rboost;
+  char *name;
+  char *data;
   float boost = 1.0;
   int stored = 0, indexed = 0, store_tv = 0;
+  int len;
   bool binary = false;
   switch (rb_scan_args(argc, argv, "25", &rname, &rdata, &rstored,
             &rindexed, &rstore_tv, &rbinary, &rboost)) {
@@ -53,9 +57,9 @@ frt_field_init(int argc, VALUE *argv, VALUE self)
       rdata = rb_obj_as_string(rdata);
       break;
   }
-  char *name = RSTRING(rname)->ptr;
-  int len = RSTRING(rdata)->len;
-  char *data = ALLOC_N(char, len + 1);
+  name = RSTRING(rname)->ptr;
+  len = RSTRING(rdata)->len;
+  data = ALLOC_N(char, len + 1);
   MEMCPY(data, RSTRING(rdata)->ptr, char, len);
   data[len] = 0;
   df_set(df, name, data, stored, indexed, store_tv);
@@ -268,8 +272,8 @@ static VALUE
 frt_doc_alloc(VALUE klass)
 {
   Document *doc = doc_create();
-  doc->free_data = NULL;
   VALUE self = Data_Wrap_Struct(klass, &frt_doc_mark, &frt_doc_free, doc);
+  doc->free_data = NULL;
   object_add(doc, self);
   return self;
 }
@@ -300,7 +304,8 @@ frt_get_doc(Document *doc)
   return self;
 }
 
-#define GET_DOC Document *doc; Data_Get_Struct(self, Document, doc)
+#define GET_DOC Document *doc = (Document *)DATA_PTR(self)
+
 static VALUE
 frt_doc_init(VALUE self) 
 {

data/ext/r_index_io.c

@@ -21,6 +21,7 @@ VALUE rterm_index_interval_key;
 
 extern void frt_set_term(VALUE rterm, Term *t);
 extern VALUE frt_get_rterm(char *field, char *text);
+extern Analyzer *frt_get_cwrapped_analyzer(VALUE ranalyzer);
 
 /****************************************************************************
  *
@@ -35,7 +36,7 @@ frt_te_free(void *p)
   te->close(te);
 }
 
-#define GET_TE TermEnum *te; Data_Get_Struct(self, TermEnum, te)
+#define GET_TE TermEnum *te = (TermEnum *)DATA_PTR(self)
 static VALUE
 frt_te_next(VALUE self)
 {
@@ -100,8 +101,8 @@ frt_tvoi_init(VALUE self, VALUE rstart, VALUE rend)
   return self;
 }
 
-#define GET_TVOI TVOffsetInfo *tvoi;\
-  Data_Get_Struct(self, TVOffsetInfo, tvoi)
+#define GET_TVOI TVOffsetInfo *tvoi = (TVOffsetInfo *)DATA_PTR(self)
+
 static VALUE
 frt_tvoi_set_start(VALUE self, VALUE rstart)
 {
@@ -135,9 +136,9 @@ frt_tvoi_get_end(VALUE self)
 static VALUE
 frt_tvoi_eql(VALUE self, VALUE rother)
 {
-  if (TYPE(rother) != T_DATA) return Qfalse;
-  TVOffsetInfo *other;
   GET_TVOI;
+  TVOffsetInfo *other;
+  if (TYPE(rother) != T_DATA) return Qfalse;
   Data_Get_Struct(rother, TVOffsetInfo, other);
 
   return ((tvoi->start == other->start) && (tvoi->end == other->end))
@@ -234,7 +235,8 @@ frt_get_tv(TermVector *tv)
   return self;
 }
 
-#define GET_TV TermVector *tv; Data_Get_Struct(self, TermVector, tv);
+#define GET_TV TermVector *tv = (TermVector *)DATA_PTR(self)
+
 static VALUE
 frt_tv_get_field(VALUE self)
 {
@@ -271,9 +273,10 @@ frt_tv_get_positions(VALUE self)
 {
   int i, j, freq;
   GET_TV;
+  VALUE rpositions, rpositionss;
+
   if (!tv->positions) return Qnil;
-  VALUE rpositions;
-  VALUE rpositionss = rb_ary_new2(tv->tcnt);
+  rpositionss = rb_ary_new2(tv->tcnt);
   for (i = 0; i < tv->tcnt; i++) {
     freq = tv->freqs[i];
     rpositions = rb_ary_new2(freq);
@@ -290,9 +293,10 @@ frt_tv_get_offsets(VALUE self)
 {
   int i, j, freq;
   GET_TV;
+  VALUE roffsetss, roffsets, roffset;
   if (!tv->offsets) return Qnil;
-  VALUE roffsets, roffset;
-  VALUE roffsetss = rb_ary_new2(tv->tcnt);
+  roffsetss = rb_ary_new2(tv->tcnt);
+
   for (i = 0; i < tv->tcnt; i++) {
     freq = tv->freqs[i];
     roffsets = rb_ary_new2(freq);
@@ -324,7 +328,8 @@ frt_get_tde(TermDocEnum *tde)
   return Data_Wrap_Struct(cTermDocEnum, NULL, &frt_tde_free, tde);
 }
 
-#define GET_TDE TermDocEnum *tde; Data_Get_Struct(self, TermDocEnum, tde)
+#define GET_TDE TermDocEnum *tde = (TermDocEnum *)DATA_PTR(self)
+
 static VALUE
 frt_tde_close(VALUE self)
 {
@@ -375,12 +380,12 @@ frt_tde_next_position(VALUE self)
 static VALUE
 frt_tde_read(VALUE self, VALUE rdocs, VALUE rfreqs)
 {
-  int i;
+  int i, req_num, cnt;
   GET_TDE;
   Check_Type(rdocs, T_ARRAY);
   Check_Type(rfreqs, T_ARRAY);
-  int req_num = MIN(RARRAY(rdocs)->len, RARRAY(rfreqs)->len);
-  int cnt = tde->read(tde, (int *)RARRAY(rdocs)->ptr,
+  req_num = MIN(RARRAY(rdocs)->len, RARRAY(rfreqs)->len);
+  cnt = tde->read(tde, (int *)RARRAY(rdocs)->ptr,
       (int *)RARRAY(rfreqs)->ptr, req_num);
   for (i = 0; i < cnt; i++) {
     RARRAY(rdocs)->ptr[i] = INT2FIX(RARRAY(rdocs)->ptr[i]);
@@ -425,8 +430,6 @@ static VALUE
 frt_iw_init(int argc, VALUE *argv, VALUE self)
 {
   VALUE rdir, roptions, rval;
-  bool close_dir = false;
-  bool close_analyzer = true;
   bool create = false;
   bool use_compound_file = true;
   Store *store;
@@ -436,20 +439,21 @@ frt_iw_init(int argc, VALUE *argv, VALUE self)
   if (argc > 0) {
     if (TYPE(rdir) == T_DATA) {
       store = DATA_PTR(rdir);
+      ref(store);
     } else {
-      rdir = rb_obj_as_string(rdir);
+      StringValue(rdir);
       store = open_fs_store(RSTRING(rdir)->ptr);
-      close_dir = true;
     }
   } else {
     store = open_ram_store();
-    close_dir = true;
   }
   if (argc == 2) {
     Check_Type(roptions, T_HASH);
+    /* Let ruby's GC handle the closing of the store
     if (!close_dir) {
       close_dir = RTEST(rb_hash_aref(roptions, rclose_dir_key));
     }
+    */
     /* use_compound_file defaults to true */
     use_compound_file = 
       (rb_hash_aref(roptions, ruse_compound_file_key) == Qfalse) ? false : true;
@@ -458,8 +462,7 @@ frt_iw_init(int argc, VALUE *argv, VALUE self)
     if (rval == Qnil) {
       analyzer = mb_standard_analyzer_create(true);
     } else {
-      Data_Get_Struct(rval, Analyzer, analyzer);
-      close_analyzer = false;
+      analyzer = frt_get_cwrapped_analyzer(rval);
     }
     create = RTEST(rb_hash_aref(roptions, rcreate_key));
     if (!create && RTEST(rb_hash_aref(roptions, rcreate_if_missing_key))) {
@@ -468,7 +471,8 @@ frt_iw_init(int argc, VALUE *argv, VALUE self)
       }
     }
   }
-  iw = iw_open(store, analyzer, create, close_dir, close_analyzer);
+  iw = iw_open(store, analyzer, create);
+  store_deref(store);
   iw->use_compound_file = use_compound_file;
 
   SET_INT_ATTR(merge_factor);
@@ -481,7 +485,8 @@ frt_iw_init(int argc, VALUE *argv, VALUE self)
   return self;
 }
 
-#define GET_IW IndexWriter *iw; Data_Get_Struct(self, IndexWriter, iw)
+#define GET_IW IndexWriter *iw = (IndexWriter *)DATA_PTR(self)
+
 static VALUE
 frt_iw_close(VALUE self)
 {
@@ -630,21 +635,21 @@ static VALUE
 frt_ir_init(int argc, VALUE *argv, VALUE self)
 {
   VALUE rdir, rclose_dir;
-  bool close_dir = true;
+  //bool close_dir = false;
   Store *store = NULL;
   IndexReader *ir;
   switch (rb_scan_args(argc, argv, "11", &rdir, &rclose_dir)) {
-    case 2: close_dir = RTEST(rclose_dir);
+    case 2: //close_dir = RTEST(rclose_dir);
     case 1: 
       if (TYPE(rdir) == T_DATA) {
         store = DATA_PTR(rdir);
       } else {
         rdir = rb_obj_as_string(rdir);
         store = open_fs_store(RSTRING(rdir)->ptr);
-        close_dir = true;
+        deref(store);
       }
   }
-  ir = ir_open(store, close_dir);
+  ir = ir_open(store);
   Frt_Wrap_Struct(self, &frt_ir_mark, &frt_ir_free, ir);
   object_add(ir, self);
   return self;
@@ -657,7 +662,8 @@ frt_ir_open(int argc, VALUE *argv, VALUE klass)
   return frt_ir_init(argc, argv, self);
 }
 
-#define GET_IR IndexReader *ir; Data_Get_Struct(self, IndexReader, ir)
+#define GET_IR IndexReader *ir = (IndexReader *)DATA_PTR(self)
+
 static VALUE
 frt_ir_set_norm(VALUE self, VALUE rdoc_num, VALUE rfield, VALUE rval)
 {
@@ -671,8 +677,9 @@ static VALUE
 frt_ir_get_norms(VALUE self, VALUE rfield)
 {
   GET_IR;
+  uchar *norms;
   rfield = rb_obj_as_string(rfield);
-  uchar *norms = ir->get_norms(ir, RSTRING(rfield)->ptr);
+  norms = ir->get_norms(ir, RSTRING(rfield)->ptr);
   if (norms) {
     return rb_str_new((char *)norms, ir->max_doc(ir));
   } else {
@@ -684,8 +691,9 @@ static VALUE
 frt_ir_get_norms_into(VALUE self, VALUE rfield, VALUE rnorms, VALUE roffset)
 {
   GET_IR;
+  int offset;
   rfield = rb_obj_as_string(rfield);
-  int offset = FIX2INT(roffset);
+  offset = FIX2INT(roffset);
   Check_Type(rnorms, T_STRING);
   if (RSTRING(rnorms)->len < offset + ir->max_doc(ir)) {
     rb_raise(rb_eArgError, "supplied a string of length:%d to IndexReader#get_norms_into but needed a string of length offset:%d + maxdoc:%d", RSTRING(rnorms)->len, offset, ir->max_doc(ir));
@@ -778,9 +786,9 @@ static VALUE
 frt_ir_get_term_vector(VALUE self, VALUE rdoc_num, VALUE rfield)
 {
   GET_IR;
+  TermVector *tv;
   rfield = rb_obj_as_string(rfield);
-  TermVector *tv =
-    ir->get_term_vector(ir, FIX2INT(rdoc_num), RSTRING(rfield)->ptr);
+  tv = ir->get_term_vector(ir, FIX2INT(rdoc_num), RSTRING(rfield)->ptr);
   return frt_get_tv(tv);
 }
 

data/ext/r_qparser.c

@@ -10,10 +10,11 @@ VALUE rwild_lower_key;
 VALUE roccur_default_key;
 VALUE rdefault_slop_key;
 VALUE rclean_str_key;
-VALUE ranalyzer_key;
+extern VALUE ranalyzer_key;
 
 extern VALUE frt_get_analyzer(Analyzer *a);
 extern VALUE frt_get_q(Query *q);
+extern Analyzer *frt_get_cwrapped_analyzer(VALUE ranalyzer);
 
 /****************************************************************************
  *
@@ -56,7 +57,7 @@ frt_get_fields(VALUE rfields)
       fields = NULL;
     } else {
       s = str = estrdup(RSTRING(rval)->ptr);
-      while ((p = index(s, '|'))) {
+      while ((p = strchr(s, '|')) != '\0') {
         *p = '\0';
         hs_add(fields, estrdup(s));
         s = p + 1;
@@ -84,7 +85,18 @@ frt_qp_init(int argc, VALUE *argv, VALUE self)
   if (argc > 0) {
     def_fields = frt_get_fields(rdef_field);
   }
-  qp = qp_create(all_fields, def_fields, NULL);
+
+  if (argc == 2) {
+    if (Qnil != (rval = rb_hash_aref(roptions, ranalyzer_key))) {
+      analyzer = frt_get_cwrapped_analyzer(rval);
+    }
+  }
+
+  if (!analyzer) {
+    analyzer = mb_standard_analyzer_create(true);
+  }
+
+  qp = qp_create(all_fields, def_fields, analyzer);
   qp->allow_any_fields = true;
   qp->clean_str = true;
   /* handle options */
@@ -107,17 +119,7 @@ frt_qp_init(int argc, VALUE *argv, VALUE self)
     if (Qnil != (rval = rb_hash_aref(roptions, rclean_str_key))) {
       qp->clean_str = RTEST(rval);
     }
-    if (Qnil != (rval = rb_hash_aref(roptions, ranalyzer_key))) {
-      Data_Get_Struct(rval, Analyzer, analyzer);
-    }
-  }
-  if (!analyzer) {
-    analyzer = letter_analyzer_create(true);
-    /* make sure the analyzer will be disposed of when the QueryParser
-     * is garbage collected. */
-    rval = frt_get_analyzer(analyzer);
   }
-  qp->analyzer = analyzer;
   Frt_Wrap_Struct(self, frt_qp_mark, frt_qp_free, qp);
   object_add(qp, self);
   return self;
@@ -162,7 +164,6 @@ 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"));
-  ranalyzer_key = ID2SYM(rb_intern("analyzer"));
 
   /* QueryParser */
   cQueryParser = rb_define_class_under(mFerret, "QueryParser", rb_cObject);

data/ext/r_search.c

@@ -14,7 +14,9 @@ extern void frt_ir_mark(void *p);
 static VALUE cScoreDoc;
 static VALUE cTopDocs;
 static VALUE cExplanation;
+static VALUE cSearcher;
 static VALUE cIndexSearcher;
+static VALUE cMultiSearcher;
 static VALUE cSortField;
 static VALUE cSortType;
 static VALUE cSort;
@@ -85,6 +87,7 @@ extern void frt_set_term(VALUE rterm, Term *t);
 extern Term *frt_get_term(VALUE rterm);
 extern VALUE frt_get_analyzer(Analyzer *a);
 extern HashSet *frt_get_fields(VALUE rfields);
+extern Analyzer *frt_get_cwrapped_analyzer(VALUE ranalyzer);
 
 /****************************************************************************
  *
@@ -147,7 +150,8 @@ frt_td_mark(void *p)
   frt_gc_mark(td->hits);
 }
 
-#define GET_TD TopDocs *td; Data_Get_Struct(self, TopDocs, td)
+#define GET_TD TopDocs *td = (TopDocs *)DATA_PTR(self)
+
 static VALUE
 frt_get_td(TopDocs *td)
 {
@@ -192,7 +196,7 @@ frt_td_total_hits(VALUE self)
 static VALUE
 frt_td_fields(VALUE self)
 {
-  GET_TD;
+  rb_raise(rb_eNotImpError, "not implemented in the c extension version");
   return Qnil;
 }
 
@@ -215,7 +219,8 @@ frt_td_each(VALUE self)
  *
  ****************************************************************************/
 
-#define GET_EXPL Explanation *expl; Data_Get_Struct(self, Explanation, expl)
+#define GET_EXPL Explanation *expl = (Explanation *)DATA_PTR(self)
+
 static VALUE
 frt_expl_to_s(VALUE self)
 {
@@ -252,12 +257,12 @@ frt_expl_value(VALUE self)
 static void
 frt_q_free(void *p)
 {
-  Query *q = (Query *)p;
   object_del(p);
-  q->destroy(q);
+  q_deref((Query *)p);
 }
 
-#define GET_Q Query *q; Data_Get_Struct(self, Query, q)
+#define GET_Q Query *q = (Query *)DATA_PTR(self)
+
 
 static VALUE
 frt_q_to_s(int argc, VALUE *argv, VALUE self)
@@ -387,15 +392,15 @@ frt_bc_mark(void *p)
 static void
 frt_bc_free(void *p)
 {
-  BooleanClause *bc = (BooleanClause *)p;
-  object_del(bc);
-  free(bc);  
+  object_del(p);
+  bc_deref((BooleanClause *)p);  
 }
 
 static VALUE
 frt_get_bc(BooleanClause *bc)
 {
   VALUE self = Data_Wrap_Struct(cBooleanClause, &frt_bc_mark, &frt_bc_free, bc);
+  ref(bc);
   object_add(bc, self);
   return self;
 }
@@ -411,13 +416,14 @@ frt_bc_init(int argc, VALUE *argv, VALUE self)
     occur = FIX2INT(roccur);
   }
   Data_Get_Struct(rquery, Query, sub_q);
+  ref(sub_q);
   bc = bc_create(sub_q, occur);
   Frt_Wrap_Struct(self, &frt_bc_mark, &frt_bc_free, bc);
   object_add(bc, self);
   return self;
 }
 
-#define GET_BC BooleanClause *bc; Data_Get_Struct(self, BooleanClause, bc)
+#define GET_BC BooleanClause *bc = (BooleanClause *)DATA_PTR(self)
 static VALUE
 frt_bc_get_query(VALUE self)
 {
@@ -505,10 +511,11 @@ frt_bq_init(int argc, VALUE *argv, VALUE self)
 {
   VALUE rcoord_disabled;
   bool coord_disabled = false;
+  Query *q;
   if (rb_scan_args(argc, argv, "01", &rcoord_disabled)) {
     coord_disabled = RTEST(rcoord_disabled);
   }
-  Query *q = bq_create(coord_disabled);
+  q = bq_create(coord_disabled);
   Frt_Wrap_Struct(self, &frt_bq_mark, &frt_q_free, q);
   object_add(q, self);
 
@@ -575,10 +582,12 @@ frt_rq_new_more(VALUE klass, VALUE rfield, VALUE rlterm, VALUE rincl)
 {
   Query *q;
   VALUE self;
-  rfield = rb_obj_as_string(rfield);
   char *lterm = NIL_P(rlterm) ? NULL : RSTRING(rb_obj_as_string(rlterm))->ptr;
-  if (!lterm) 
-    rb_raise(rb_eArgError, "The lower term must not be nil in a more than query");
+  rfield = rb_obj_as_string(rfield);
+  if (!lterm) {
+    rb_raise(rb_eArgError, "The lower term must not be nil in a more "
+                           "than query");
+  }
   q = rq_create_more(RSTRING(rfield)->ptr, lterm, RTEST(rincl));
   self = Data_Wrap_Struct(klass, NULL, &frt_q_free, q);
   object_add(q, self);
@@ -590,10 +599,12 @@ frt_rq_new_less(VALUE klass, VALUE rfield, VALUE ruterm, VALUE rincu)
 {
   Query *q;
   VALUE self;
-  rfield = rb_obj_as_string(rfield);
   char *uterm = NIL_P(ruterm) ? NULL : RSTRING(rb_obj_as_string(ruterm))->ptr;
-  if (!uterm) 
-    rb_raise(rb_eArgError, "The upper term must not be nil in a less than query");
+  rfield = rb_obj_as_string(rfield);
+  if (!uterm) {
+    rb_raise(rb_eArgError, "The upper term must not be nil in a less "
+                           "than query");
+  }
   q = rq_create_less(RSTRING(rfield)->ptr, uterm, RTEST(rincu));
   self = Data_Wrap_Struct(klass, NULL, &frt_q_free, q);
   object_add(q, self);
@@ -734,7 +745,6 @@ frt_mphq_set_slop(VALUE self, VALUE rslop)
   return self;
 }
 
-
 /****************************************************************************
  *
  * PrefixQuery Methods
@@ -1054,9 +1064,10 @@ frt_spanxq_mark(void *p)
 static VALUE
 frt_spanxq_init(VALUE self, VALUE rinc, VALUE rexc)
 {
+  Query *q;
   Check_Type(rinc, T_DATA);
   Check_Type(rexc, T_DATA);
-  Query *q = spanxq_create(DATA_PTR(rinc), DATA_PTR(rexc));
+  q = spanxq_create(DATA_PTR(rinc), DATA_PTR(rexc));
   q->destroy_all = false;
   Frt_Wrap_Struct(self, &frt_spanxq_mark, &frt_q_free, q);
   object_add(q, self);
@@ -1077,7 +1088,7 @@ frt_f_free(void *p)
   f->destroy(f);
 }
 
-#define GET_F Filter *f; Data_Get_Struct(self, Filter, f)
+#define GET_F Filter *f = (Filter *)DATA_PTR(self)
 
 static VALUE
 frt_f_to_s(VALUE self)
@@ -1126,11 +1137,14 @@ frt_rf_new_more(int argc, VALUE *argv, VALUE klass)
   Filter *f;
   VALUE self;
   VALUE rfield, rlterm, rincl;
+  char *lterm;
   rb_scan_args(argc, argv, "21", &rfield, &rlterm, &rincl);
   rfield = rb_obj_as_string(rfield);
-  char *lterm = NIL_P(rlterm) ? NULL : RSTRING(rb_obj_as_string(rlterm))->ptr;
-  if (!lterm) 
-    rb_raise(rb_eArgError, "The lower term must not be nil in a more than filter");
+  lterm = NIL_P(rlterm) ? NULL : RSTRING(rb_obj_as_string(rlterm))->ptr;
+  if (!lterm) {
+    rb_raise(rb_eArgError, "The lower term must not be nil in a more "
+                           "than filter");
+  }
   f = rfilt_create(RSTRING(rfield)->ptr, lterm, NULL, rincl != Qfalse, false);
   self = Data_Wrap_Struct(klass, NULL, &frt_f_free, f);
   object_add(f, self);
@@ -1143,11 +1157,14 @@ frt_rf_new_less(int argc, VALUE *argv, VALUE klass)
   Filter *f;
   VALUE self;
   VALUE rfield, ruterm, rincu;
+  char *uterm;
   rb_scan_args(argc, argv, "21", &rfield, &ruterm, &rincu);
   rfield = rb_obj_as_string(rfield);
-  char *uterm = NIL_P(ruterm) ? NULL : RSTRING(rb_obj_as_string(ruterm))->ptr;
-  if (!uterm) 
-    rb_raise(rb_eArgError, "The upper term must not be nil in a less than filter");
+  uterm = NIL_P(ruterm) ? NULL : RSTRING(rb_obj_as_string(ruterm))->ptr;
+  if (!uterm) {
+    rb_raise(rb_eArgError, "The upper term must not be nil in a less "
+                           "than filter");
+  }
   f = rfilt_create(RSTRING(rfield)->ptr, NULL, uterm, false, rincu != Qfalse);
   self = Data_Wrap_Struct(klass, NULL, &frt_f_free, f);
   object_add(f, self);
@@ -1181,9 +1198,8 @@ frt_qf_init(VALUE self, VALUE rquery)
 static void 
 frt_sf_free(void *p)
 {
-  SortField *sf = (SortField *)p;
-  object_del(sf);
-  sort_field_destroy(sf);
+  object_del(p);
+  sort_field_destroy((SortField *)p);
 }
 
 static VALUE
@@ -1220,13 +1236,16 @@ frt_sf_init(int argc, VALUE *argv, VALUE self)
   rfield = rb_obj_as_string(rfield);
 
   sf = sort_field_create(RSTRING(rfield)->ptr, sort_type, is_reverse);
+  if (sf->field == NULL && RSTRING(rfield)->ptr != NULL) {
+    sf->field = estrdup(RSTRING(rfield)->ptr);
+  }
   
   Frt_Wrap_Struct(self, NULL, &frt_sf_free, sf);
   object_add(sf, self);
   return self;
 }
 
-#define GET_SF SortField *sf; Data_Get_Struct(self, SortField, sf)
+#define GET_SF SortField *sf = (SortField *)DATA_PTR(self)
 static VALUE
 frt_sf_is_reverse(VALUE self)
 {
@@ -1254,9 +1273,19 @@ frt_sf_get_comparator(VALUE self)
   return Qnil;
 }
 
+static VALUE
+frt_sf_to_s(VALUE self)
+{
+  GET_SF;
+  char *str = sort_field_to_s(sf);
+  VALUE rstr = rb_str_new2(str);
+  free(str);
+  return rstr;
+}
+
 /****************************************************************************
  *
- * SortField Methods
+ * Sort Methods
  *
  ****************************************************************************/
 
@@ -1317,7 +1346,7 @@ frt_sort_add(Sort *sort, VALUE rsf, bool reverse)
   sort_add_sort_field(sort, sf);
 }
 
-#define GET_SORT Sort *sort; Data_Get_Struct(self, Sort, sort)
+#define GET_SORT Sort *sort = (Sort *)DATA_PTR(self)
 static VALUE
 frt_sort_init(int argc, VALUE *argv, VALUE self)
 {
@@ -1363,65 +1392,34 @@ frt_sort_get_fields(VALUE self)
   return object_get(sort->sort_fields);
 }
 
+
+static VALUE
+frt_sort_to_s(VALUE self)
+{
+  GET_SORT;
+  char *str = sort_to_s(sort);
+  VALUE rstr = rb_str_new2(str);
+  free(str);
+  return rstr;
+}
 /****************************************************************************
  *
- * IndexSearcher Methods
+ * Searcher Methods
  *
  ****************************************************************************/
 
 static void
-frt_is_free(void *p)
+frt_sea_free(void *p)
 {
   Searcher *sea = (Searcher *)p;
-  sea->close(sea);
+  object_del(sea);
+  sea_close(sea);
 }
 
-static void
-frt_is_mark(void *p)
-{
-  Searcher *sea = (Searcher *)p;
-  frt_gc_mark(sea->ir);
-  frt_gc_mark(sea->ir->store);
-}
-
-#define FRT_GET_IR(rir, ir) do {\
-  rir = Data_Wrap_Struct(cIndexReader, &frt_ir_mark, &frt_ir_free, ir);\
-  object_add(ir, rir);\
-} while (0)
-
-static VALUE
-frt_is_init(VALUE self, VALUE obj)
-{
-  Store *store = NULL;
-  IndexReader *ir = NULL;
-  Searcher *sea;
-  if (TYPE(obj) == T_STRING) {
-    store = open_fs_store(StringValueCStr(obj));
-    ir = ir_open(store, true);
-    FRT_GET_IR(obj, ir);
-  } else {
-    Check_Type(obj, T_DATA);
-    if (rb_obj_is_kind_of(obj, cDirectory) == Qtrue) {
-      Data_Get_Struct(obj, Store, store);
-      ir = ir_open(store, false);
-      FRT_GET_IR(obj, ir);
-    } else if (rb_obj_is_kind_of(obj, cIndexReader) == Qtrue) {
-      Data_Get_Struct(obj, IndexReader, ir);
-    } else {
-      rb_raise(rb_eArgError, "Unknown type for argument to IndexSearcher.new");
-    }
-  }
-
-  sea = sea_create(ir);
-  sea->close_ir = false;
-  Frt_Wrap_Struct(self, &frt_is_mark, &frt_is_free, sea);
-  return self;
-}
-
-#define GET_SEA Searcher *sea; Data_Get_Struct(self, Searcher, sea)
+#define GET_SEA Searcher *sea = (Searcher *)DATA_PTR(self)
 
 static VALUE
-frt_is_close(VALUE self)
+frt_sea_close(VALUE self)
 {
   GET_SEA;
   Frt_Unwrap_Struct(self);
@@ -1430,14 +1428,14 @@ frt_is_close(VALUE self)
 }
 
 static VALUE
-frt_is_get_reader(VALUE self, VALUE rterm)
+frt_sea_get_reader(VALUE self, VALUE rterm)
 {
   GET_SEA;
   return object_get(sea->ir);
 }
 
 static VALUE
-frt_is_doc_freq(VALUE self, VALUE rterm)
+frt_sea_doc_freq(VALUE self, VALUE rterm)
 {
   GET_SEA;
   Term t;
@@ -1446,13 +1444,15 @@ frt_is_doc_freq(VALUE self, VALUE rterm)
 }
 
 static VALUE
-frt_is_doc_freqs(VALUE self, VALUE rterms)
+frt_sea_doc_freqs(VALUE self, VALUE rterms)
 {
   int i;
   GET_SEA;
   Term t;
+  VALUE freqs;
   Check_Type(rterms, T_ARRAY);
-  VALUE freqs = rb_ary_new2(RARRAY(rterms)->len);
+
+  freqs = rb_ary_new2(RARRAY(rterms)->len);
   for (i = 0; i < RARRAY(rterms)->len; i++) {
     frt_set_term(RARRAY(rterms)->ptr[i], &t);
     rb_ary_store(freqs, i, INT2FIX(sea->doc_freq(sea, &t)));
@@ -1461,21 +1461,21 @@ frt_is_doc_freqs(VALUE self, VALUE rterms)
 }
 
 static VALUE
-frt_is_doc(VALUE self, VALUE rdoc_num)
+frt_sea_doc(VALUE self, VALUE rdoc_num)
 {
   GET_SEA;
   return frt_get_doc(sea->get_doc(sea, FIX2INT(rdoc_num)));
 }
 
 static VALUE
-frt_is_max_doc(VALUE self)
+frt_sea_max_doc(VALUE self)
 {
   GET_SEA;
   return INT2FIX(sea->max_doc(sea));
 }
 
 static TopDocs *
-frt_is_search_internal(Query *query, VALUE roptions, Searcher *sea)
+frt_sea_search_internal(Query *query, VALUE roptions, Searcher *sea)
 {
   VALUE rval;
   int first_doc = 0, num_docs = 10;
@@ -1508,68 +1508,179 @@ frt_is_search_internal(Query *query, VALUE roptions, Searcher *sea)
 }
 
 static VALUE
-frt_is_search(int argc, VALUE *argv, VALUE self)
+frt_sea_search(int argc, VALUE *argv, VALUE self)
 {
   GET_SEA;
   VALUE rquery, roptions;
   Query *query;
   rb_scan_args(argc, argv, "11", &rquery, &roptions);
   Data_Get_Struct(rquery, Query, query);
-  return frt_get_td(frt_is_search_internal(query, roptions, sea));
+  return frt_get_td(frt_sea_search_internal(query, roptions, sea));
 }
 
 static VALUE
-frt_is_search_each(VALUE self, VALUE rquery, VALUE roptions)
+frt_sea_search_each(VALUE self, VALUE rquery, VALUE roptions)
 {
   return Qnil;
 }
 
 static VALUE
-frt_is_explain(VALUE self, VALUE rquery, VALUE rdoc_num)
+frt_sea_explain(VALUE self, VALUE rquery, VALUE rdoc_num)
 {
   GET_SEA;
   Query *query;
+  Explanation *expl;
   Data_Get_Struct(rquery, Query, query);
-  Explanation *expl = sea->explain(sea, query, FIX2INT(rdoc_num));
+  expl = sea->explain(sea, query, FIX2INT(rdoc_num));
   return Data_Wrap_Struct(cExplanation, NULL, &expl_destoy, expl);
 }
 
 /****************************************************************************
  *
- * Index Methods
+ * IndexSearcher Methods
  *
  ****************************************************************************/
 
-extern inline void ensure_searcher_open(Index *self);
-extern inline void ensure_reader_open(Index *self);
-extern inline void ensure_writer_open(Index *self);
+static void
+frt_is_mark(void *p)
+{
+  Searcher *sea = (Searcher *)p;
+  frt_gc_mark(sea->ir);
+  frt_gc_mark(sea->ir->store);
+}
+
+#define FRT_GET_IR(rir, ir) do {\
+  rir = Data_Wrap_Struct(cIndexReader, &frt_ir_mark, &frt_ir_free, ir);\
+  object_add(ir, rir);\
+} while (0)
+
+static VALUE
+frt_is_init(VALUE self, VALUE obj)
+{
+  Store *store = NULL;
+  IndexReader *ir = NULL;
+  Searcher *sea;
+  if (TYPE(obj) == T_STRING) {
+    store = open_fs_store(StringValueCStr(obj));
+    ir = ir_open(store);
+    deref(store);
+    FRT_GET_IR(obj, ir);
+  } else {
+    Check_Type(obj, T_DATA);
+    if (rb_obj_is_kind_of(obj, cDirectory) == Qtrue) {
+      Data_Get_Struct(obj, Store, store);
+      ir = ir_open(store);
+      FRT_GET_IR(obj, ir);
+    } else if (rb_obj_is_kind_of(obj, cIndexReader) == Qtrue) {
+      Data_Get_Struct(obj, IndexReader, ir);
+    } else {
+      rb_raise(rb_eArgError, "Unknown type for argument to IndexSearcher.new");
+    }
+  }
+
+  sea = sea_create(ir);
+  sea->close_ir = false;
+  Frt_Wrap_Struct(self, &frt_is_mark, &frt_sea_free, sea);
+  object_add(sea, self);
+  return self;
+}
+
+/****************************************************************************
+ *
+ * MultiSearcher Methods
+ *
+ ****************************************************************************/
+
+static void
+frt_ms_free(void *p)
+{
+  Searcher *sea = (Searcher *)p;
+  MultiSearcher *msea = (MultiSearcher *)sea->data;
+  free(msea->searchers);
+  object_del(sea);
+  sea_close(sea);
+}
+
+static void
+frt_ms_mark(void *p)
+{
+  int i;
+  Searcher *sea = (Searcher *)p;
+  MultiSearcher *msea = (MultiSearcher *)sea->data;
+  for (i = 0; i < msea->s_cnt; i++) {
+    frt_gc_mark(msea->searchers[i]);
+  }
+}
+
+static VALUE
+frt_ms_init(int argc, VALUE *argv, VALUE self)
+{
+  int i, j;
+
+  VALUE rsearcher;
+  Array *searchers = ary_create(argc, (free_ft)NULL);
+  Searcher *s;
+
+  for (i = 0; i < argc; i++) {
+    rsearcher = argv[i];
+    switch (TYPE(rsearcher)) {
+      case T_ARRAY:
+        for (j = 0; j < RARRAY(rsearcher)->len; j++) {
+          VALUE rs = RARRAY(rsearcher)->ptr[j];
+          Data_Get_Struct(rs, Searcher, s);
+          ary_append(searchers, s);
+        }
+      break;
+      case T_DATA:
+        Data_Get_Struct(rsearcher, Searcher, s);
+        ary_append(searchers, s);
+        break;
+      default:
+        rb_raise(rb_eArgError, "Can't add class %s to MultiSearcher",
+            rb_obj_classname(rsearcher));
+        break;
+    }
+  }
+  s = msea_create((Searcher **)searchers->elems, searchers->size, false);
+  free(searchers); /* only free the Array, not the elems array holding the searchers */
+  Frt_Wrap_Struct(self, &frt_ms_mark, &frt_ms_free, s);
+  object_add(s, self);
+  return self;
+}
 
+/****************************************************************************
+ *
+ * Index Methods
+ *
+ ****************************************************************************/
+
+/*
 static void
 frt_ind_free_store_i(Index *self)
 {
   VALUE rval;
   if (self->close_store && (Qnil != (rval = object_get(self->store)))) {
-    /* user passed close_dir option so unwrap it */
+    // user passed close_dir option so unwrap it 
     Frt_Unwrap_Struct(rval);
     object_del(self->store);
   }
 }
+*/
 
 static void
 frt_ind_free(void *p)
 {
-  Index *self = (Index *)p;
-  frt_ind_free_store_i(self);
-  object_del(self);
-  index_destroy(self);
+  Index *ind = (Index *)p;
+  object_del(ind);
+  index_destroy(ind);
 }
 
 static void
 frt_ind_mark(void *p)
 {
-  Index *self = (Index *)p;
-  frt_gc_mark(self->store);
-  frt_gc_mark(self->analyzer);
+  Index *ind = (Index *)p;
+  frt_gc_mark(ind->store);
+  frt_gc_mark(ind->analyzer);
 }
 
 static VALUE
@@ -1582,14 +1693,13 @@ frt_ind_init(int argc, VALUE *argv, VALUE self)
     Store *store = NULL;
     Analyzer *analyzer = NULL;
     bool create = false;
-    bool close_store = false;
     HashSet *def_fields = NULL;
 
     if (Qnil != (rval = rb_hash_aref(roptions, rpath_key))) {
       rval = rb_obj_as_string(rval);
       /* TODO: create the directory if it is missing */
       store = open_fs_store(RSTRING(rval)->ptr);
-      close_store = true;
+      deref(store);
     } else if (Qnil != (rval = rb_hash_aref(roptions, rdir_key))) {
       Data_Get_Struct(rval, Store, store);
     }
@@ -1611,19 +1721,21 @@ frt_ind_init(int argc, VALUE *argv, VALUE self)
     }
 
     if (Qnil != (rval = rb_hash_aref(roptions, ranalyzer_key))) {
-      Data_Get_Struct(rval, Analyzer, analyzer);
+      analyzer = frt_get_cwrapped_analyzer(rval);
     }
     if (Qnil != (rval = rb_hash_aref(roptions, rdefault_search_field_key))) {
       def_fields = frt_get_fields(rval);
     }
     if (Qnil != (rval = rb_hash_aref(roptions, rclose_dir_key))) {
-      if (RTEST(rval) && !close_store) close_store = true;
+      /* No need to do anything here. Let the GC do the work. 
+       * if (RTEST(rval) && !close_store) close_store = true;
+       */
     }
     if (Qnil != (rval = rb_hash_aref(roptions, rdefault_field_key))) {
       if (!def_fields) def_fields = frt_get_fields(rval);
     }
     ind = index_create(store, analyzer, def_fields, create);
-    if (close_store) ind->close_store = close_store;
+    if (analyzer) a_deref(analyzer);
     
     /* QueryParser options */
     if (Qnil != (rval = rb_hash_aref(roptions, rhandle_parse_errors_key))) {
@@ -1686,13 +1798,13 @@ frt_ind_init(int argc, VALUE *argv, VALUE self)
   return self;
 }
 
-#define GET_IND Index *ind; Data_Get_Struct(self, Index, ind);\
+#define GET_IND Index *ind = (Index *)DATA_PTR(self);\
   if (!ind) rb_raise(rb_eStandardError, "Called method on closed Index object")
 static VALUE
 frt_ind_close(VALUE self)
 {
   GET_IND;
-  frt_ind_free_store_i(ind);
+  //frt_ind_free_store_i(ind);
   Frt_Unwrap_Struct(self);
   object_del(ind);
   index_destroy(ind);
@@ -1778,9 +1890,9 @@ frt_ind_add_doc(int argc, VALUE *argv, VALUE self)
   doc = frt_rdoc_to_doc(ind, rdoc, &close_doc);
 
   if (argc == 2) {
-    Analyzer *analyzer;
-    Data_Get_Struct(ranalyzer, Analyzer, analyzer);
+    Analyzer *analyzer = frt_get_cwrapped_analyzer(ranalyzer);
     index_add_doc_a(ind, doc, analyzer);
+    a_deref(analyzer);
   } else {
     index_add_doc(ind, doc);
   }
@@ -1789,7 +1901,7 @@ frt_ind_add_doc(int argc, VALUE *argv, VALUE self)
 }
 
 static Query *
-frt_get_query_i(Index *ind, VALUE rquery, bool *destroy_query)
+frt_ind_get_query_i(Index *ind, VALUE rquery)
 {
   Query *q = NULL;
 
@@ -1798,10 +1910,10 @@ frt_get_query_i(Index *ind, VALUE rquery, bool *destroy_query)
       rquery = rb_obj_as_string(rquery);
     case T_STRING:
       q = index_get_query(ind, RSTRING(rquery)->ptr);
-      *destroy_query = true;
       break;
     case T_DATA:
       Data_Get_Struct(rquery, Query, q);
+      ref(q);
       break;
     default:
       rb_raise(rb_eArgError, "Can only handle a String or a Query.");
@@ -1816,14 +1928,13 @@ frt_ind_search(int argc, VALUE *argv, VALUE self)
 {
   Query *q;
   VALUE rquery, roptions, rtd;
-  bool destroy_query = false;
   GET_IND;
   rb_scan_args(argc, argv, "11", &rquery, &roptions);
   ensure_searcher_open(ind);
 
-  q = frt_get_query_i(ind, rquery, &destroy_query);
-  rtd = frt_get_td(frt_is_search_internal(q, roptions, ind->sea));
-  if (destroy_query) q->destroy(q);
+  q = frt_ind_get_query_i(ind, rquery);
+  rtd = frt_get_td(frt_sea_search_internal(q, roptions, ind->sea));
+  q_deref(q);
 
   return rtd;
 }
@@ -1835,7 +1946,6 @@ frt_ind_search_each(int argc, VALUE *argv, VALUE self)
   Query *q;
   TopDocs *td;
   VALUE rquery, roptions, rtotal_hits;
-  bool destroy_query = false;
   GET_IND;
 
 
@@ -1845,10 +1955,10 @@ frt_ind_search_each(int argc, VALUE *argv, VALUE self)
 
   ensure_searcher_open(ind);
 
-  q = frt_get_query_i(ind, rquery, &destroy_query);
+  q = frt_ind_get_query_i(ind, rquery);
   //printf(">>>>>%s<<<<<\n", q->to_s(q, "file_name"));
-  td = frt_is_search_internal(q, roptions, ind->sea);
-  if (destroy_query) q->destroy(q);
+  td = frt_sea_search_internal(q, roptions, ind->sea);
+  q_deref(q);
 
   rtotal_hits = INT2FIX(td->total_hits);
 
@@ -2061,7 +2171,7 @@ struct QueryUpdateArg {
   Index *ind;
 };
 
-static void frt_ind_qupd_i(Searcher *sea, int doc_num, void *arg)
+static void frt_ind_qupd_i(Searcher *sea, int doc_num, float score, void *arg)
 {
   struct QueryUpdateArg *qua = (struct QueryUpdateArg *)arg;
   Document *doc = sea->ir->get_doc(sea->ir, doc_num);
@@ -2073,22 +2183,19 @@ static void frt_ind_qupd_i(Searcher *sea, int doc_num, void *arg)
 static VALUE
 frt_ind_query_update(VALUE self, VALUE rquery, VALUE rdoc)
 {
-  GET_IND;
-  
   int i;
   Query *q;
-  bool destroy_query = false;
   struct QueryUpdateArg qua;
-
+  GET_IND;
 
   ensure_searcher_open(ind);  
   qua.rdoc = rdoc;
-  qua.docs = ary_create(8, &doc_destroy);
+  qua.docs = ary_create(8, (free_ft)&doc_destroy);
   qua.ind = ind;
 
-  q = frt_get_query_i(ind, rquery, &destroy_query);
+  q = frt_ind_get_query_i(ind, rquery);
   sea_search_each(ind->sea, q, NULL, &frt_ind_qupd_i, &qua);
-  if (destroy_query) q->destroy(q);
+  q_deref(q);
   
   for (i = 0; i < qua.docs->size; i++) {
     index_add_doc(ind, qua.docs->elems[i]);
@@ -2206,37 +2313,37 @@ static VALUE
 frt_ind_persist(int argc, VALUE *argv, VALUE self)
 {
   VALUE rdir, rcreate;
-  bool create, close_store;
+  bool create;
   Store *old_store;
   GET_IND;
 
   index_flush(ind);
-  frt_ind_free_store_i(ind);
+  //frt_ind_free_store_i(ind);
   old_store = ind->store;
-  close_store = ind->close_store;
 
   rb_scan_args(argc, argv, "11", &rdir, &rcreate);
   create = RTEST(rcreate);
 
   if (T_DATA == TYPE(rdir)) {
     Data_Get_Struct(rdir, Store, ind->store);
+    ref(ind->store);
   } else {
     rdir = rb_obj_as_string(rdir);
     ind->store = open_fs_store(RSTRING(rdir)->ptr);
-    ind->close_store = true;
   }
 
   if (!create && !ind->store->exists(ind->store, "segments")) create = true;
 
   if (create) {
-    ind->iw = iw_open(ind->store, NULL, create, false, false);
+    ind->iw = iw_open(ind->store, ind->analyzer, create);
+    ref(ind->analyzer);
     ind->iw->use_compound_file = ind->use_compound_file;
   }
 
   ensure_writer_open(ind);
   iw_add_indexes(ind->iw, &old_store, 1);
 
-  if (close_store) old_store->close(old_store);
+  store_deref(old_store);
 
   index_auto_flush_iw(ind);
 
@@ -2246,11 +2353,12 @@ frt_ind_persist(int argc, VALUE *argv, VALUE self)
 static VALUE
 frt_ind_explain(VALUE self, VALUE rquery, VALUE rdoc_num)
 {
+  Query *q;
+  Explanation *expl;
   GET_IND;
-  bool destroy_query = false;
-  Query *q = frt_get_query_i(ind, rquery, &destroy_query);
-  Explanation *expl = index_explain(ind, q, FIX2INT(rdoc_num));
-  if (destroy_query) q->destroy(q);
+  q = frt_ind_get_query_i(ind, rquery);
+  expl = index_explain(ind, q, FIX2INT(rdoc_num));
+  q_deref(q);
   return Data_Wrap_Struct(cExplanation, NULL, &expl_destoy, expl);
 }
 
@@ -2498,6 +2606,7 @@ Init_search(void)
   rb_define_method(cSortField, "name", frt_sf_get_name, 0);
   rb_define_method(cSortField, "sort_type", frt_sf_get_sort_type, 0);
   rb_define_method(cSortField, "comparator", frt_sf_get_comparator, 0);
+  rb_define_method(cSortField, "to_s", frt_sf_to_s, 0);
 
   /* SortType */
   cSortType = rb_define_class_under(cSortField, "SortType", rb_cObject);
@@ -2536,27 +2645,36 @@ Init_search(void)
 
   rb_define_method(cSort, "initialize", frt_sort_init, -1);
   rb_define_method(cSort, "fields", frt_sort_get_fields, 0);
+  rb_define_method(cSort, "to_s", frt_sort_to_s, 0);
 
   rb_define_const(cSort, "RELEVANCE",
       frt_sort_init(0, NULL, frt_sort_alloc(cSort)));
   rb_define_const(cSort, "INDEX_ORDER",
       frt_sort_init(1, &oSORT_FIELD_DOC, frt_sort_alloc(cSort)));
 
+  /* Searcher */
+  cSearcher = rb_define_class_under(mSearch, "Searcher", rb_cObject);
+  rb_define_method(cSearcher, "close", frt_sea_close, 0);
+  rb_define_method(cSearcher, "reader", frt_sea_get_reader, 0);
+  rb_define_method(cSearcher, "doc_freq", frt_sea_doc_freq, 1);
+  rb_define_method(cSearcher, "doc_freqs", frt_sea_doc_freqs, 1);
+  rb_define_method(cSearcher, "doc", frt_sea_doc, 1);
+  rb_define_method(cSearcher, "[]", frt_sea_doc, 1);
+  rb_define_method(cSearcher, "max_doc", frt_sea_max_doc, 0);
+  rb_define_method(cSearcher, "search", frt_sea_search, -1);
+  rb_define_method(cSearcher, "search_each", frt_sea_search_each, 2);
+  rb_define_method(cSearcher, "explain", frt_sea_explain, 2);
+
   /* IndexSearcher */
-  cIndexSearcher = rb_define_class_under(mSearch, "IndexSearcher", rb_cObject);
+  cIndexSearcher = rb_define_class_under(mSearch, "IndexSearcher", cSearcher);
   rb_define_alloc_func(cIndexSearcher, frt_data_alloc);
-
   rb_define_method(cIndexSearcher, "initialize", frt_is_init, 1);
-  rb_define_method(cIndexSearcher, "close", frt_is_close, 0);
-  rb_define_method(cIndexSearcher, "reader", frt_is_get_reader, 0);
-  rb_define_method(cIndexSearcher, "doc_freq", frt_is_doc_freq, 1);
-  rb_define_method(cIndexSearcher, "doc_freqs", frt_is_doc_freqs, 1);
-  rb_define_method(cIndexSearcher, "doc", frt_is_doc, 1);
-  rb_define_method(cIndexSearcher, "[]", frt_is_doc, 1);
-  rb_define_method(cIndexSearcher, "max_doc", frt_is_max_doc, 0);
-  rb_define_method(cIndexSearcher, "search", frt_is_search, -1);
-  rb_define_method(cIndexSearcher, "search_each", frt_is_search_each, 2);
-  rb_define_method(cIndexSearcher, "explain", frt_is_explain, 2);
+
+  /* MultiSearcher */
+  cMultiSearcher = rb_define_class_under(mSearch, "MultiSearcher", cSearcher);
+  rb_define_alloc_func(cMultiSearcher, frt_data_alloc);
+  rb_define_method(cMultiSearcher, "initialize", frt_ms_init, -1);
+
 
   /* Index */
   cIndex = rb_define_class_under(mIndex, "Index", rb_cObject);