ferret 0.11.6 → 0.11.8.4

data/ext/r_qparser.c

@@ -1,3 +1,4 @@
+#include "symbol.h"
 #include "ferret.h"
 #include "search.h"
 
@@ -17,10 +18,11 @@ static VALUE sym_handle_parse_errors;
 static VALUE sym_clean_string;
 static VALUE sym_max_clauses;
 static VALUE sym_use_keywords;
+static VALUE sym_use_typed_range_query;
 
-extern VALUE frt_get_analyzer(Analyzer *a);
-extern VALUE frt_get_q(Query *q);
-extern Analyzer *frt_get_cwrapped_analyzer(VALUE ranalyzer);
+extern VALUE frb_get_analyzer(Analyzer *a);
+extern VALUE frb_get_q(Query *q);
+extern Analyzer *frb_get_cwrapped_analyzer(VALUE ranalyzer);
 
 /****************************************************************************
  *
@@ -29,20 +31,20 @@ extern Analyzer *frt_get_cwrapped_analyzer(VALUE ranalyzer);
  ****************************************************************************/
 
 static void
-frt_qp_free(void *p)
+frb_qp_free(void *p)
 {
     object_del(p);
     qp_destroy((QParser *)p);
 }
 
 static void
-frt_qp_mark(void *p)
+frb_qp_mark(void *p)
 {
-    frt_gc_mark(((QParser *)p)->analyzer);
+    frb_gc_mark(((QParser *)p)->analyzer);
 }
 
 static HashSet *
-frt_get_fields(VALUE rfields)
+frb_get_fields(VALUE rfields)
 {
     VALUE rval;
     HashSet *fields;
@@ -50,12 +52,12 @@ frt_get_fields(VALUE rfields)
 
     if (rfields == Qnil) return NULL;
 
-    fields = hs_new_str(&free);
+    fields = hs_new_ptr(NULL);
     if (TYPE(rfields) == T_ARRAY) {
         int i;
-        for (i = 0; i < RARRAY(rfields)->len; i++) {
-            rval = rb_obj_as_string(RARRAY(rfields)->ptr[i]);
-            hs_add(fields, nstrdup(rval));
+        for (i = 0; i < RARRAY_LEN(rfields); i++) {
+            rval = rb_obj_as_string(RARRAY_PTR(rfields)[i]);
+            hs_add(fields, (char *)rintern(rval));
         }
     } else {
         rval = rb_obj_as_string(rfields);
@@ -63,19 +65,28 @@ frt_get_fields(VALUE rfields)
             hs_destroy(fields);
             fields = NULL;
         } else {
-            s = str = nstrdup(rval);
+            s = str = rstrdup(rval);
             while ((p = strchr(s, '|')) != '\0') {
                 *p = '\0';
-                hs_add(fields, estrdup(s));
+                hs_add(fields, (char *)intern(s));
                 s = p + 1;
             }
-            hs_add(fields, estrdup(s));
+            hs_add(fields, (char *)intern(s));
             free(str);
         }
     }
     return fields;
 }
 
+static void
+hs_safe_merge(HashSet *merger, HashSet *mergee)
+{
+    HashSetEntry *hse;
+    for (hse = mergee->first; hse; hse = hse->next) {
+        hs_add(merger, (char *)hse->elem);
+    }
+}
+
 /* 
  *  call-seq:
  *     QueryParser.new(options = {}) -> QueryParser
@@ -85,50 +96,60 @@ frt_get_fields(VALUE rfields)
  *
  *  === Options
  *
- *  :default_field::       Default: "*" (all fields). The default field to
- *                         search when no field is specified in the search
- *                         string. It can also be an array of fields.
- *  :analyzer::            Default: StandardAnalyzer. Analyzer used by the
- *                         query parser to parse query terms
- *  :wild_card_downcase::  Default: true. Specifies whether wild-card queries
- *                         and range queries should be downcased or not since
- *                         they are not passed through the parser
- *  :fields::              Default: []. Lets the query parser know what
- *                         fields are available for searching, particularly
- *                         when the "*" is specified as the search field
- *  :tokenized_fields::    Default: :fields. Lets the query parser know which
- *                         fields are tokenized so it knows which fields to
- *                         run the analyzer over.
- *  :validate_fields::     Default: false. Set to true if you want an
- *                         exception to be raised if there is an attempt to
- *                         search a non-existent field
- *  :or_default::          Default: true. Use "OR" as the default boolean
- *                         operator
- *  :default_slop::        Default: 0. Default slop to use in PhraseQuery
- *  :handle_parse_errors:: Default: true. QueryParser will quietly handle all
- *                         parsing errors internally. If you'd like to handle
- *                         them yourself, set this parameter to false.
- *  :clean_string::        Default: true. QueryParser will do a quick
- *                         once-over the query string make sure that quotes
- *                         and brackets match up and special characters are
- *                         escaped
- *  :max_clauses::         Default: 512. the maximum number of clauses
- *                         allowed in boolean queries and the maximum number
- *                         of terms allowed in multi, prefix, wild-card or
- *                         fuzzy queries when those queries are generated by
- *                         rewriting other queries
- *  :use_keywords:         Default: true. By default AND, OR, NOT and REQ are
- *                         keywords used by the query parser. Sometimes this
- *                         is undesirable. For example, if your application
- *                         allows searching for US states by their
- *                         abbreviation, then OR will be a common query
- *                         string. By setting :use_keywords to false, OR will
- *                         no longer be a keyword allowing searches for the
- *                         state of Oregon. You will still be able to use
- *                         boolean queries by using the + and - characters.
+ *  :default_field::         Default: "*" (all fields). The default field to
+ *                           search when no field is specified in the search
+ *                           string. It can also be an array of fields.
+ *  :analyzer::              Default: StandardAnalyzer. Analyzer used by the
+ *                           query parser to parse query terms
+ *  :wild_card_downcase::    Default: true. Specifies whether wild-card queries
+ *                           and range queries should be downcased or not since
+ *                           they are not passed through the parser
+ *  :fields::                Default: []. Lets the query parser know what
+ *                           fields are available for searching, particularly
+ *                           when the "*" is specified as the search field
+ *  :tokenized_fields::      Default: :fields. Lets the query parser know which
+ *                           fields are tokenized so it knows which fields to
+ *                           run the analyzer over.
+ *  :validate_fields::       Default: false. Set to true if you want an
+ *                           exception to be raised if there is an attempt to
+ *                           search a non-existent field
+ *  :or_default::            Default: true. Use "OR" as the default boolean
+ *                           operator
+ *  :default_slop::          Default: 0. Default slop to use in PhraseQuery
+ *  :handle_parse_errors::   Default: true. QueryParser will quietly handle all
+ *                           parsing errors internally. If you'd like to handle
+ *                           them yourself, set this parameter to false.
+ *  :clean_string::          Default: true. QueryParser will do a quick
+ *                           once-over the query string make sure that quotes
+ *                           and brackets match up and special characters are
+ *                           escaped
+ *  :max_clauses::           Default: 512. the maximum number of clauses
+ *                           allowed in boolean queries and the maximum number
+ *                           of terms allowed in multi, prefix, wild-card or
+ *                           fuzzy queries when those queries are generated by
+ *                           rewriting other queries
+ *  :use_keywords::          Default: true. By default AND, OR, NOT and REQ are
+ *                           keywords used by the query parser. Sometimes this
+ *                           is undesirable. For example, if your application
+ *                           allows searching for US states by their
+ *                           abbreviation, then OR will be a common query
+ *                           string. By setting :use_keywords to false, OR will
+ *                           no longer be a keyword allowing searches for the
+ *                           state of Oregon. You will still be able to use
+ *                           boolean queries by using the + and - characters.
+ *  :use_typed_range_query:: Default: false. Use TypedRangeQuery instead of
+ *                           the standard RangeQuery when parsing
+ *                           range queries. This is useful if you have number
+ *                           fields which you want to perform range queries
+ *                           on. You won't need to pad or normalize the data
+ *                           in the field in anyway to get correct results.
+ *                           However, performance will be a lot slower for
+ *                           large indexes, hence the default.
+ *                           Note: the default is set to true in the Index
+ *                           class.
  */                   
 static VALUE
-frt_qp_init(int argc, VALUE *argv, VALUE self)
+frb_qp_init(int argc, VALUE *argv, VALUE self)
 {
     VALUE roptions = Qnil;
     VALUE rval;
@@ -144,34 +165,45 @@ frt_qp_init(int argc, VALUE *argv, VALUE self)
         if (TYPE(roptions) == T_HASH) {
             has_options = true;
             if (Qnil != (rval = rb_hash_aref(roptions, sym_default_field))) {
-                def_fields = frt_get_fields(rval);
+                def_fields = frb_get_fields(rval);
             }
             if (Qnil != (rval = rb_hash_aref(roptions, sym_analyzer))) {
-                analyzer = frt_get_cwrapped_analyzer(rval);
+                analyzer = frb_get_cwrapped_analyzer(rval);
             }
             if (Qnil != (rval = rb_hash_aref(roptions, sym_all_fields))) {
-                all_fields = frt_get_fields(rval);
+                all_fields = frb_get_fields(rval);
             }
             if (Qnil != (rval = rb_hash_aref(roptions, sym_fields))) {
-                all_fields = frt_get_fields(rval);
+                all_fields = frb_get_fields(rval);
             }
             if (Qnil != (rval = rb_hash_aref(roptions, sym_tkz_fields))) {
-                tkz_fields = frt_get_fields(rval);
+                tkz_fields = frb_get_fields(rval);
             }
         } else {
-            def_fields = frt_get_fields(roptions);
+            def_fields = frb_get_fields(roptions);
             roptions = Qnil;
         }
     }
     if (all_fields == NULL) {
-        all_fields = hs_new_str(&free);
+        all_fields = hs_new_ptr(NULL);
     }
 
     if (!analyzer) {
         analyzer = mb_standard_analyzer_new(true);
     }
 
-    qp = qp_new(all_fields, def_fields, tkz_fields, analyzer);
+    qp = qp_new(analyzer);
+    hs_destroy(qp->all_fields);
+    hs_destroy(qp->def_fields);
+    //hs_destroy(qp->tokenized_fields);
+
+    if (def_fields) hs_safe_merge(all_fields, def_fields);
+    if (tkz_fields) hs_safe_merge(all_fields, tkz_fields);
+    qp->all_fields = all_fields;
+    qp->def_fields = def_fields ? def_fields : all_fields;
+    qp->tokenized_fields = tkz_fields ? tkz_fields : all_fields;
+    qp->fields_top->fields = def_fields;
+
     qp->allow_any_fields = true;
     qp->clean_str = true;
     qp->handle_parse_errors = true;
@@ -201,8 +233,11 @@ frt_qp_init(int argc, VALUE *argv, VALUE self)
         if (Qnil != (rval = rb_hash_aref(roptions, sym_use_keywords))) {
             qp->use_keywords = RTEST(rval);
         }
+        if (Qnil != (rval = rb_hash_aref(roptions, sym_use_typed_range_query))){
+            qp->use_typed_range_query = RTEST(rval);
+        }
     }
-    Frt_Wrap_Struct(self, frt_qp_mark, frt_qp_free, qp);
+    Frt_Wrap_Struct(self, frb_qp_mark, frb_qp_free, qp);
     object_add(qp, self);
     return self;
 }
@@ -216,14 +251,14 @@ frt_qp_init(int argc, VALUE *argv, VALUE self)
  *  Will raise a QueryParseException if unsuccessful. 
  */
 static VALUE
-frt_qp_parse(VALUE self, VALUE rstr)
+frb_qp_parse(VALUE self, VALUE rstr)
 {
     const char *msg = NULL;
     volatile VALUE rq;
     GET_QP;
     rstr = rb_obj_as_string(rstr);
     TRY
-        rq = frt_get_q(qp_parse(qp, rs2s(rstr)));
+        rq = frb_get_q(qp_parse(qp, rs2s(rstr)));
         break;
     default:
         msg = xcontext.msg;
@@ -231,7 +266,7 @@ frt_qp_parse(VALUE self, VALUE rstr)
     XENDTRY
 
     if (msg) {
-        rb_raise(cQueryParseException, msg);
+        rb_raise(cQueryParseException, "%s", msg);
     }
 
     return rq;
@@ -244,15 +279,15 @@ frt_qp_parse(VALUE self, VALUE rstr)
  *  Returns the list of all fields that the QueryParser knows about.
  */
 static VALUE
-frt_qp_get_fields(VALUE self)
+frb_qp_get_fields(VALUE self)
 {
     GET_QP;
-    int i;
     HashSet *fields = qp->all_fields;
+    HashSetEntry *hse;
     VALUE rfields = rb_ary_new();
 
-    for (i = 0; i < fields->size; i++) {
-        rb_ary_push(rfields, ID2SYM(rb_intern((char *)fields->elems[i])));
+    for (hse = fields->first; hse; hse = hse->next) {
+        rb_ary_push(rfields, ID2SYM(rb_intern((char *)hse->elem)));
     } 
 
     return rfields;
@@ -265,22 +300,34 @@ frt_qp_get_fields(VALUE self)
  *  Set the list of fields. These fields are expanded for searches on "*".
  */
 static VALUE
-frt_qp_set_fields(VALUE self, VALUE rfields)
+frb_qp_set_fields(VALUE self, VALUE rfields)
 {
     GET_QP;
-    HashSet *fields = frt_get_fields(rfields);
+    HashSet *fields = frb_get_fields(rfields);
+
+    /* if def_fields == all_fields then we need to replace both */
+    if (qp->def_fields == qp->all_fields) qp->def_fields = NULL;
+    if (qp->tokenized_fields == qp->all_fields) qp->tokenized_fields = NULL;
 
-    if (qp->def_fields == qp->all_fields) {
-        qp->def_fields = NULL;
-    }
     if (fields == NULL) {
-        fields = hs_new_str(&free);
+        fields = hs_new_ptr(NULL);
     }
+
+    /* make sure all the fields in tokenized fields are contained in
+     * all_fields */
+    if (qp->tokenized_fields) hs_safe_merge(fields, qp->tokenized_fields);
+
+    /* delete old fields set */
+    assert(qp->all_fields->free_elem_i == dummy_free);
     hs_destroy(qp->all_fields);
+
+    /* add the new fields set and add to def_fields if necessary */
     qp->all_fields = fields;
     if (qp->def_fields == NULL) {
         qp->def_fields = fields;
+        qp->fields_top->fields = fields;
     }
+    if (qp->tokenized_fields == NULL) qp->tokenized_fields = fields;
 
     return self;
 }
@@ -292,16 +339,16 @@ frt_qp_set_fields(VALUE self, VALUE rfields)
  *  Returns the list of all tokenized_fields that the QueryParser knows about.
  */
 static VALUE
-frt_qp_get_tkz_fields(VALUE self)
+frb_qp_get_tkz_fields(VALUE self)
 {
     GET_QP;
-    int i;
     HashSet *fields = qp->tokenized_fields;
     if (fields) {
         VALUE rfields = rb_ary_new();
+        HashSetEntry *hse;
 
-        for (i = 0; i < fields->size; i++) {
-            rb_ary_push(rfields, ID2SYM(rb_intern((char *)fields->elems[i])));
+        for (hse = fields->first; hse; hse = hse->next) {
+            rb_ary_push(rfields, ID2SYM(rb_intern((char *)hse->elem)));
         } 
 
         return rfields;
@@ -319,11 +366,13 @@ frt_qp_get_tkz_fields(VALUE self)
  *  the queries. If this is set to Qnil then all fields will be tokenized. 
  */
 static VALUE
-frt_qp_set_tkz_fields(VALUE self, VALUE rfields)
+frb_qp_set_tkz_fields(VALUE self, VALUE rfields)
 {
     GET_QP;
-    if (qp->tokenized_fields) hs_destroy(qp->tokenized_fields);
-    qp->tokenized_fields = frt_get_fields(rfields);
+    if (qp->tokenized_fields != qp->all_fields) {
+        hs_destroy(qp->tokenized_fields);
+    }
+    qp->tokenized_fields = frb_get_fields(rfields);
     return self;
 }
 
@@ -566,19 +615,20 @@ Init_QueryParser(void)
     sym_clean_string = ID2SYM(rb_intern("clean_string"));
     sym_max_clauses = ID2SYM(rb_intern("max_clauses"));
     sym_use_keywords = ID2SYM(rb_intern("use_keywords"));
+    sym_use_typed_range_query = ID2SYM(rb_intern("use_typed_range_query"));
 
     /* QueryParser */
     cQueryParser = rb_define_class_under(mFerret, "QueryParser", rb_cObject);
-    rb_define_alloc_func(cQueryParser, frt_data_alloc);
+    rb_define_alloc_func(cQueryParser, frb_data_alloc);
 
-    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);
+    rb_define_method(cQueryParser, "initialize", frb_qp_init, -1);
+    rb_define_method(cQueryParser, "parse", frb_qp_parse, 1);
+    rb_define_method(cQueryParser, "fields", frb_qp_get_fields, 0);
+    rb_define_method(cQueryParser, "fields=", frb_qp_set_fields, 1);
     rb_define_method(cQueryParser, "tokenized_fields",
-                     frt_qp_get_tkz_fields, 0);
+                     frb_qp_get_tkz_fields, 0);
     rb_define_method(cQueryParser, "tokenized_fields=",
-                     frt_qp_set_tkz_fields, 1);
+                     frb_qp_set_tkz_fields, 1);
 
     Init_QueryParseException();
 }

data/ext/r_search.c

@@ -1,6 +1,10 @@
 #include "ferret.h"
-#include <st.h>
-#include <rubysig.h>
+#ifdef FRT_RUBY_VERSION_1_9
+#  include <ruby/st.h>
+#else
+#  include <st.h>
+#  include <rubysig.h>
+#endif
 #include <ctype.h>
 #include <array.h>
 #include "search.h"
@@ -22,6 +26,7 @@ static VALUE cMultiTermQuery;
 static VALUE cBooleanQuery;
 static VALUE cBooleanClause;
 static VALUE cRangeQuery;
+static VALUE cTypedRangeQuery;
 static VALUE cPhraseQuery;
 static VALUE cPrefixQuery;
 static VALUE cWildcardQuery;
@@ -41,6 +46,7 @@ static VALUE cSpanNotQuery;
 static ID id_bits;
 static VALUE cFilter;
 static VALUE cRangeFilter;
+static VALUE cTypedRangeFilter;
 static VALUE cQueryFilter;
 
 /* MultiTermQuery */
@@ -111,10 +117,12 @@ static ID id_searcher;
 /* Search */
 static VALUE sym_offset;
 static VALUE sym_limit;
+static VALUE sym_start_doc;
 static VALUE sym_all;
 static VALUE sym_sort;
 static VALUE sym_filter;
 static VALUE sym_filter_proc;
+static VALUE sym_c_filter_proc;
 
 static VALUE sym_excerpt_length;
 static VALUE sym_num_excerpts;  
@@ -122,15 +130,17 @@ static VALUE sym_pre_tag;
 static VALUE sym_post_tag;      
 static VALUE sym_ellipsis;      
 
+static Symbol fsym_id;
+
 extern VALUE cIndexReader;
-extern void frt_ir_free(void *p);
-extern void frt_ir_mark(void *p);
+extern void frb_ir_free(void *p);
+extern void frb_ir_mark(void *p);
 
-extern void frt_set_term(VALUE rterm, Term *t);
-extern VALUE frt_get_analyzer(Analyzer *a);
-extern HashSet *frt_get_fields(VALUE rfields);
-extern Analyzer *frt_get_cwrapped_analyzer(VALUE ranalyzer);
-extern VALUE frt_get_lazy_doc(LazyDoc *lazy_doc);
+extern void frb_set_term(VALUE rterm, Term *t);
+extern VALUE frb_get_analyzer(Analyzer *a);
+extern HashSet *frb_get_fields(VALUE rfields);
+extern Analyzer *frb_get_cwrapped_analyzer(VALUE ranalyzer);
+extern VALUE frb_get_lazy_doc(LazyDoc *lazy_doc);
 
 /****************************************************************************
  *
@@ -139,7 +149,7 @@ extern VALUE frt_get_lazy_doc(LazyDoc *lazy_doc);
  ****************************************************************************/
 
 static VALUE
-frt_get_hit(Hit *hit)
+frb_get_hit(Hit *hit)
 {
     return rb_struct_new(cHit,
                          INT2FIX(hit->doc),
@@ -154,15 +164,14 @@ frt_get_hit(Hit *hit)
  ****************************************************************************/
 
 static VALUE
-frt_get_td(TopDocs *td, VALUE rsearcher)
+frb_get_td(TopDocs *td, VALUE rsearcher)
 {
     int i;
     VALUE rtop_docs;
     VALUE hit_ary = rb_ary_new2(td->size);
 
     for (i = 0; i < td->size; i++) {
-        RARRAY(hit_ary)->ptr[i] = frt_get_hit(td->hits[i]);
-        RARRAY(hit_ary)->len++;
+      rb_ary_store(hit_ary, i, frb_get_hit(td->hits[i]));
     }
 
     rtop_docs = rb_struct_new(cTopDocs,
@@ -182,50 +191,57 @@ frt_get_td(TopDocs *td, VALUE rsearcher)
  *  Returns a string representation of the top_doc in readable format.
  */
 static VALUE
-frt_td_to_s(int argc, VALUE *argv, VALUE self)
+frb_td_to_s(int argc, VALUE *argv, VALUE self)
 {
     int i;
     VALUE rhits = rb_funcall(self, id_hits, 0);
     Searcher *sea = (Searcher *)DATA_PTR(rb_funcall(self, id_searcher, 0));
-    const int len = RARRAY(rhits)->len;
+    const int len = RARRAY_LEN(rhits);
+    int capa = len * 64 + 100;
+    int p = 0;
     char *str = ALLOC_N(char, len * 64 + 100);
-    char *s = str;
-    char *field = "id";
+    Symbol field = fsym_id;
     VALUE rstr;
 
     if (argc) {
-        field = frt_field(argv[0]);
+        field = frb_field(argv[0]);
     }
 
-    sprintf(s, "TopDocs: total_hits = %ld, max_score = %f [\n",
-            FIX2INT(rb_funcall(self, id_total_hits, 0)),
+    sprintf(str, "TopDocs: total_hits = %ld, max_score = %lf [\n",
+            FIX2LONG(rb_funcall(self, id_total_hits, 0)),
             NUM2DBL(rb_funcall(self, id_max_score, 0)));
-    s += strlen(s);
+    p = (int)strlen(str);
 
     for (i = 0; i < len; i++) {
-        VALUE rhit = RARRAY(rhits)->ptr[i];
+        VALUE rhit = RARRAY_PTR(rhits)[i];
         int doc_id = FIX2INT(rb_funcall(rhit, id_doc, 0));
         char *value = "";
+        size_t value_len = 0;
         LazyDoc *lzd = sea->get_lazy_doc(sea, doc_id);
-        LazyDocField *lzdf = h_get(lzd->field_dict, field);
+        LazyDocField *lzdf = lazy_doc_get(lzd, field);
         if (NULL != lzdf) {
             value = lazy_df_get_data(lzdf, 0);
+            value_len = strlen(value);
+        }
+        if (p + value_len + 64 > capa) {
+            capa += (value_len + 64) * (len - i);
+            REALLOC_N(str, char, capa);
         }
 
-        sprintf(s, "\t%d \"%s\": %f\n", doc_id, value,
+        sprintf(str + p, "\t%d \"%s\": %0.5f\n", doc_id, value,
                 NUM2DBL(rb_funcall(rhit, id_score, 0)));
-        s += strlen(s);
+        p += strlen(str + p);
         lazy_doc_close(lzd);
     }
 
-    sprintf(s, "]\n");
+    sprintf(str + p, "]\n");
     rstr = rb_str_new2(str);
     free(str);
     return rstr;
 }
 
 static INLINE char *
-frt_lzd_load_to_json(LazyDoc *lzd, char **str, char *s, int *slen)
+frb_lzd_load_to_json(LazyDoc *lzd, char **str, char *s, int *slen)
 {
 	int i, j;
 	int diff = s - *str;
@@ -238,7 +254,7 @@ frt_lzd_load_to_json(LazyDoc *lzd, char **str, char *s, int *slen)
          * 4 times field elements to make space for '"' around fields and ','
          * between fields. Add 100 for '[', ']' and good safety.
          */
-        len += strlen(f->name) + f->len * 3 + 100 + 4 * f->size;
+        len += sym_len(f->name) + f->len * 3 + 100 + 4 * f->size;
     }
 
     if (len > *slen) {
@@ -248,11 +264,13 @@ frt_lzd_load_to_json(LazyDoc *lzd, char **str, char *s, int *slen)
     }
 
 	for (i = 0; i < lzd->size; i++) {
+        const char *field_name;
 		f = lzd->fields[i];
+        field_name = S(f->name);
 		if (i)  *(s++) = ',';
         *(s++) = '"';
-        l = strlen(f->name);
-        memcpy(s, f->name, l);
+        l = strlen(field_name);
+        memcpy(s, field_name, l);
         s += l;
         *(s++) = '"';
         *(s++) = ':';
@@ -273,14 +291,14 @@ frt_lzd_load_to_json(LazyDoc *lzd, char **str, char *s, int *slen)
  *  Returns a json representation of the top_doc.
  */
 static VALUE
-frt_td_to_json(VALUE self)
+frb_td_to_json(VALUE self)
 {
 	int i;
 	VALUE rhits = rb_funcall(self, id_hits, 0);
 	VALUE rhit;
 	LazyDoc *lzd;
 	Searcher *sea = (Searcher *)DATA_PTR(rb_funcall(self, id_searcher, 0));
-	const int num_hits = RARRAY(rhits)->len;
+	const int num_hits = RARRAY_LEN(rhits);
 	int doc_id;
     int len = 32768;
 	char *str = ALLOC_N(char, len);
@@ -291,10 +309,10 @@ frt_td_to_json(VALUE self)
 	for (i = 0; i < num_hits; i++) {
         if (i) *(s++) = ',';
         *(s++) = '{';
-		rhit = RARRAY(rhits)->ptr[i];
+		rhit = RARRAY_PTR(rhits)[i];
 		doc_id = FIX2INT(rb_funcall(rhit, id_doc, 0));
 		lzd = sea->get_lazy_doc(sea, doc_id);
-		s = frt_lzd_load_to_json(lzd, &str, s, &len);
+		s = frb_lzd_load_to_json(lzd, &str, s, &len);
         lazy_doc_close(lzd);
         *(s++) = '}';
 	}
@@ -321,7 +339,7 @@ frt_td_to_json(VALUE self)
  *  Returns a string representation of the explanation in readable format.
  */
 static VALUE
-frt_expl_to_s(VALUE self)
+frb_expl_to_s(VALUE self)
 {
     GET_EXPL();
     char *str = expl_to_s(expl);
@@ -337,7 +355,7 @@ frt_expl_to_s(VALUE self)
  *  Returns an html representation of the explanation in readable format.
  */
 static VALUE
-frt_expl_to_html(VALUE self)
+frb_expl_to_html(VALUE self)
 {
     GET_EXPL();
     char *str = expl_to_html(expl);
@@ -355,7 +373,7 @@ frt_expl_to_html(VALUE self)
  *  matches that of the score for the document in the original query.
  */
 static VALUE
-frt_expl_score(VALUE self)
+frb_expl_score(VALUE self)
 {
     GET_EXPL();
     return rb_float_new((double)expl->value);
@@ -368,7 +386,7 @@ frt_expl_score(VALUE self)
  ****************************************************************************/
 
 static void
-frt_q_free(void *p)
+frb_q_free(void *p)
 {
     object_del(p);
     q_deref((Query *)p);
@@ -385,13 +403,14 @@ frt_q_free(void *p)
  *  began with. This can be a good way to explore how the QueryParser works.
  */
 static VALUE
-frt_q_to_s(int argc, VALUE *argv, VALUE self)
+frb_q_to_s(int argc, VALUE *argv, VALUE self)
 {
     GET_Q();
     VALUE rstr, rfield;
-    char *str, *field = "";
+    char *str;
+    Symbol field = NULL;
     if (rb_scan_args(argc, argv, "01", &rfield)) {
-        field = frt_field(rfield);
+        field = frb_field(rfield);
     }
     str = q->to_s(q, field);
     rstr = rb_str_new2(str);
@@ -407,7 +426,7 @@ frt_q_to_s(int argc, VALUE *argv, VALUE self)
  *  information on Query boosts.
  */
 static VALUE
-frt_q_get_boost(VALUE self)
+frb_q_get_boost(VALUE self)
 {
     GET_Q();
     return rb_float_new((double)q->boost);
@@ -421,7 +440,7 @@ frt_q_get_boost(VALUE self)
  *  on Query boosts.
  */
 static VALUE
-frt_q_set_boost(VALUE self, VALUE rboost)
+frb_q_set_boost(VALUE self, VALUE rboost)
 {
     GET_Q();
     q->boost = (float)NUM2DBL(rboost);
@@ -436,7 +455,7 @@ frt_q_set_boost(VALUE self, VALUE rboost)
  *  in a hash object.
  */
 static VALUE
-frt_q_hash(VALUE self)
+frb_q_hash(VALUE self)
 {
     GET_Q();
     return INT2FIX(q->hash(q));
@@ -456,7 +475,7 @@ frt_q_hash(VALUE self)
  *  expected however.
  */
 static VALUE
-frt_q_eql(VALUE self, VALUE other)
+frb_q_eql(VALUE self, VALUE other)
 {
     GET_Q();
     Query *oq;
@@ -474,27 +493,30 @@ frt_q_eql(VALUE self, VALUE other)
  *  in a real search.
  */
 static VALUE
-frt_q_get_terms(VALUE self, VALUE searcher)
+frb_q_get_terms(VALUE self, VALUE searcher)
 {
-    int i;
     VALUE rterms = rb_ary_new();
-    HashSet *terms = term_set_new();
+    HashSet *terms = hs_new((hash_ft)&term_hash,
+                            (eq_ft)&term_eq,
+                            (free_ft)term_destroy);
+    HashSetEntry *hse;
     GET_Q();
     Searcher *sea = (Searcher *)DATA_PTR(searcher);
     Query *rq = sea->rewrite(sea, q);
     rq->extract_terms(rq, terms);
     q_deref(rq);
-    for (i = 0; i < terms->size; i++) {
-        Term *term = (Term *)terms->elems[i];
-        rb_ary_push(rterms, frt_get_term(term->field, term->text));
+
+    for (hse = terms->first; hse; hse = hse->next) {
+        Term *term = (Term *)hse->elem;
+        rb_ary_push(rterms, frb_get_term(term->field, term->text));
     }
     hs_destroy(terms);
     return rterms;
 }
 
-#define MK_QUERY(klass, q) Data_Wrap_Struct(klass, NULL, &frt_q_free, q)
+#define MK_QUERY(klass, q) Data_Wrap_Struct(klass, NULL, &frb_q_free, q)
 VALUE
-frt_get_q(Query *q)
+frb_get_q(Query *q)
 {
     VALUE self = object_get(q);
 
@@ -524,6 +546,9 @@ frt_get_q(Query *q)
             case RANGE_QUERY:
                 self = MK_QUERY(cRangeQuery, q);
                 break;
+            case TYPED_RANGE_QUERY:
+                self = MK_QUERY(cTypedRangeQuery, q);
+                break;
             case WILD_CARD_QUERY:
                 self = MK_QUERY(cWildcardQuery, q);
                 break;
@@ -579,12 +604,12 @@ frt_get_q(Query *q)
  *  Note: As usual, field should be a symbol
  */
 static VALUE
-frt_tq_init(VALUE self, VALUE rfield, VALUE rterm)
+frb_tq_init(VALUE self, VALUE rfield, VALUE rterm)
 {
-    char *field = frt_field(rfield);
+    Symbol field = frb_field(rfield);
     char *term = rs2s(rb_obj_as_string(rterm));
     Query *q = tq_new(field, term);
-    Frt_Wrap_Struct(self, NULL, &frt_q_free, q);
+    Frt_Wrap_Struct(self, NULL, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -603,7 +628,7 @@ frt_tq_init(VALUE self, VALUE rfield, VALUE rterm)
  *  also used by PrefixQuery, FuzzyQuery and WildcardQuery.
  */
 static VALUE
-frt_mtq_get_dmt(VALUE self)
+frb_mtq_get_dmt(VALUE self)
 {
     return rb_cvar_get(cMultiTermQuery, id_default_max_terms);
 }
@@ -616,14 +641,18 @@ frt_mtq_get_dmt(VALUE self)
  *  also used by PrefixQuery, FuzzyQuery and WildcardQuery.
  */
 static VALUE
-frt_mtq_set_dmt(VALUE self, VALUE rnum_terms)
+frb_mtq_set_dmt(VALUE self, VALUE rnum_terms)
 {
     int max_terms = FIX2INT(rnum_terms);
     if (max_terms <= 0) {
         rb_raise(rb_eArgError,
                  "%d <= 0. @@max_terms must be > 0", max_terms);
     }
+#ifdef FRT_RUBY_VERSION_1_9
+    rb_cvar_set(cMultiTermQuery, id_default_max_terms, rnum_terms);
+#else
     rb_cvar_set(cMultiTermQuery, id_default_max_terms, rnum_terms, Qfalse);
+#endif
     return rnum_terms;
 }
 
@@ -652,11 +681,11 @@ frt_mtq_set_dmt(VALUE self, VALUE rnum_terms)
  *               FuzzyQuery in particular makes use of this parameter.
  */
 static VALUE
-frt_mtq_init(int argc, VALUE *argv, VALUE self)
+frb_mtq_init(int argc, VALUE *argv, VALUE self)
 {
     VALUE rfield, roptions;
     float min_score = 0.0;
-    int max_terms = FIX2INT(frt_mtq_get_dmt(self));
+    int max_terms = FIX2INT(frb_mtq_get_dmt(self));
     Query *q;
 
     if (rb_scan_args(argc, argv, "11", &rfield, &roptions) == 2) {
@@ -668,8 +697,8 @@ frt_mtq_init(int argc, VALUE *argv, VALUE self)
             min_score = (float)NUM2DBL(v);
         }
     }
-    q = multi_tq_new_conf(frt_field(rfield), max_terms, min_score);
-    Frt_Wrap_Struct(self, NULL, &frt_q_free, q);
+    q = multi_tq_new_conf(frb_field(rfield), max_terms, min_score);
+    Frt_Wrap_Struct(self, NULL, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -683,7 +712,7 @@ frt_mtq_init(int argc, VALUE *argv, VALUE self)
  *  otherwise.
  */
 static VALUE
-frt_mtq_add_term(int argc, VALUE *argv, VALUE self)
+frb_mtq_add_term(int argc, VALUE *argv, VALUE self)
 {
     GET_Q();
     VALUE rterm, rboost;
@@ -698,10 +727,29 @@ frt_mtq_add_term(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-typedef Query *(*mtq_maker_ft)(const char *field, const char *term);
+typedef Query *(*mtq_maker_ft)(Symbol field, const char *term);
+
+static int
+get_max_terms(VALUE rmax_terms, int max_terms)
+{
+    VALUE v;
+    switch (TYPE(rmax_terms)) {
+        case T_HASH:
+            if (Qnil != (v = rb_hash_aref(rmax_terms, sym_max_terms))) {
+                max_terms = FIX2INT(v);
+            }
+            break;
+        case T_FIXNUM:
+            max_terms = FIX2INT(rmax_terms);
+            break;
+        default:
+            rb_raise(rb_eArgError, "max_terms must be an integer");
+    }
+    return max_terms;
+}
 
 static VALUE
-frt_mtq_init_specific(int argc, VALUE *argv, VALUE self, mtq_maker_ft mm)
+frb_mtq_init_specific(int argc, VALUE *argv, VALUE self, mtq_maker_ft mm)
 {
     VALUE rfield, rterm, rmax_terms;
     int max_terms =
@@ -709,12 +757,12 @@ frt_mtq_init_specific(int argc, VALUE *argv, VALUE self, mtq_maker_ft mm)
     Query *q;
 
     if (rb_scan_args(argc, argv, "21", &rfield, &rterm, &rmax_terms) == 3) {
-        max_terms = FIX2INT(rmax_terms);
+        max_terms = get_max_terms(rmax_terms, max_terms);
     }
 
-    q = (*mm)(frt_field(rfield), StringValuePtr(rterm));
+    q = (*mm)(frb_field(rfield), StringValuePtr(rterm));
     MTQMaxTerms(q) = max_terms;
-    Frt_Wrap_Struct(self, NULL, &frt_q_free, q);
+    Frt_Wrap_Struct(self, NULL, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -726,31 +774,31 @@ frt_mtq_init_specific(int argc, VALUE *argv, VALUE self, mtq_maker_ft mm)
  ****************************************************************************/
 
 static void
-frt_bc_mark(void *p)
+frb_bc_mark(void *p)
 {
-    frt_gc_mark(((BooleanClause *)p)->query);
+    frb_gc_mark(((BooleanClause *)p)->query);
 }
 
 static void
-frt_bc_free(void *p)
+frb_bc_free(void *p)
 {
     object_del(p);
     bc_deref((BooleanClause *)p);  
 }
 
 static VALUE
-frt_bc_wrap(BooleanClause *bc)
+frb_bc_wrap(BooleanClause *bc)
 {
-    VALUE self = Data_Wrap_Struct(cBooleanClause, &frt_bc_mark, &frt_bc_free, bc);
+    VALUE self = Data_Wrap_Struct(cBooleanClause, &frb_bc_mark, &frb_bc_free, bc);
     REF(bc);
     object_add(bc, self);
     return self;
 }
 
-static enum BC_TYPE
-frt_get_occur(VALUE roccur)
+static BCType
+frb_get_occur(VALUE roccur)
 {
-    enum BC_TYPE occur = BC_SHOULD;
+    BCType occur = BC_SHOULD;
 
     if (roccur == sym_should) {
         occur = BC_SHOULD;
@@ -773,19 +821,19 @@ frt_get_occur(VALUE roccur)
  *  must be one of +:must+, +:should+ or +:must_not+.
  */
 static VALUE
-frt_bc_init(int argc, VALUE *argv, VALUE self)
+frb_bc_init(int argc, VALUE *argv, VALUE self)
 {
     BooleanClause *bc;
     VALUE rquery, roccur;
     unsigned int occur = BC_SHOULD;
     Query *sub_q;
     if (rb_scan_args(argc, argv, "11", &rquery, &roccur) == 2) {
-        occur = frt_get_occur(roccur);
+        occur = frb_get_occur(roccur);
     }
     Data_Get_Struct(rquery, Query, sub_q);
     REF(sub_q);
     bc = bc_new(sub_q, occur);
-    Frt_Wrap_Struct(self, &frt_bc_mark, &frt_bc_free, bc);
+    Frt_Wrap_Struct(self, &frb_bc_mark, &frb_bc_free, bc);
     object_add(bc, self);
     return self;
 }
@@ -798,7 +846,7 @@ frt_bc_init(int argc, VALUE *argv, VALUE self)
  *  Return the query object wrapped by this BooleanClause.
  */
 static VALUE
-frt_bc_get_query(VALUE self)
+frb_bc_get_query(VALUE self)
 {
     GET_BC();
     return object_get(bc->query);
@@ -811,7 +859,7 @@ frt_bc_get_query(VALUE self)
  *  Set the query wrapped by this BooleanClause.
  */
 static VALUE
-frt_bc_set_query(VALUE self, VALUE rquery)
+frb_bc_set_query(VALUE self, VALUE rquery)
 {
     GET_BC();
     Data_Get_Struct(rquery, Query, bc->query);
@@ -826,7 +874,7 @@ frt_bc_set_query(VALUE self, VALUE rquery)
  *  equal to +:must+.
  */
 static VALUE
-frt_bc_is_required(VALUE self)
+frb_bc_is_required(VALUE self)
 {
     GET_BC();
     return bc->is_required ? Qtrue : Qfalse;
@@ -840,7 +888,7 @@ frt_bc_is_required(VALUE self)
  *  equal to +:must_not+.
  */
 static VALUE
-frt_bc_is_prohibited(VALUE self)
+frb_bc_is_prohibited(VALUE self)
 {
     GET_BC();
     return bc->is_prohibited ? Qtrue : Qfalse;
@@ -854,10 +902,10 @@ frt_bc_is_prohibited(VALUE self)
  *  +:must+, +:should+ or +:must_not+.
  */
 static VALUE
-frt_bc_set_occur(VALUE self, VALUE roccur)
+frb_bc_set_occur(VALUE self, VALUE roccur)
 {
     GET_BC();
-    enum BC_TYPE occur = frt_get_occur(roccur);
+    BCType occur = frb_get_occur(roccur);
     bc_set_occur(bc, occur);
 
     return roccur;
@@ -872,13 +920,13 @@ frt_bc_set_occur(VALUE self, VALUE roccur)
  *  whether the clause is +:must+, +:should+ or +:must_not+.
  */
 static VALUE
-frt_bc_to_s(VALUE self)
+frb_bc_to_s(VALUE self)
 {
     VALUE rstr;
     char *qstr, *ostr = "", *str;
     int len;
     GET_BC();
-    qstr = bc->query->to_s(bc->query, "");
+    qstr = bc->query->to_s(bc->query, NULL);
     switch (bc->occur) {
         case BC_SHOULD:
             ostr = "Should";
@@ -906,13 +954,13 @@ frt_bc_to_s(VALUE self)
  ****************************************************************************/
 
 static void
-frt_bq_mark(void *p)
+frb_bq_mark(void *p)
 {
     int i;
     Query *q = (Query *)p;
     BooleanQuery *bq = (BooleanQuery *)q;
     for (i = 0; i < bq->clause_cnt; i++) {
-        frt_gc_mark(bq->clauses[i]);
+        frb_gc_mark(bq->clauses[i]);
     }
 }
 
@@ -927,7 +975,7 @@ frt_bq_mark(void *p)
  *  should leave this parameter as is.
  */
 static VALUE
-frt_bq_init(int argc, VALUE *argv, VALUE self)
+frb_bq_init(int argc, VALUE *argv, VALUE self)
 {
     VALUE rcoord_disabled;
     bool coord_disabled = false;
@@ -936,7 +984,7 @@ frt_bq_init(int argc, VALUE *argv, VALUE self)
         coord_disabled = RTEST(rcoord_disabled);
     }
     q = bq_new(coord_disabled);
-    Frt_Wrap_Struct(self, &frt_bq_mark, &frt_q_free, q);
+    Frt_Wrap_Struct(self, &frb_bq_mark, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -963,16 +1011,16 @@ frt_bq_init(int argc, VALUE *argv, VALUE self)
  *  returns:: BooleanClause which was added
  */
 static VALUE
-frt_bq_add_query(int argc, VALUE *argv, VALUE self)
+frb_bq_add_query(int argc, VALUE *argv, VALUE self)
 {
     GET_Q();
     VALUE rquery, roccur;
-    enum BC_TYPE occur = BC_SHOULD;
+    BCType occur = BC_SHOULD;
     Query *sub_q;
     VALUE klass;
 
     if (rb_scan_args(argc, argv, "11", &rquery, &roccur) == 2) {
-        occur = frt_get_occur(roccur);
+        occur = frb_get_occur(roccur);
     }
     klass = CLASS_OF(rquery);
     if (klass == cBooleanClause) {
@@ -985,7 +1033,7 @@ frt_bq_add_query(int argc, VALUE *argv, VALUE self)
         return rquery;
     } else if (TYPE(rquery) == T_DATA) {
         Data_Get_Struct(rquery, Query, sub_q);
-        return frt_bc_wrap(bq_add_query(q, sub_q, occur));
+        return frb_bc_wrap(bq_add_query(q, sub_q, occur));
     } else {
         rb_raise(rb_eArgError, "Cannot add %s to a BooleanQuery",
                  rb_class2name(klass));
@@ -1006,19 +1054,19 @@ get_range_params(VALUE roptions, char **lterm, char **uterm,
     VALUE v;
     Check_Type(roptions, T_HASH);
     if (Qnil != (v = rb_hash_aref(roptions, sym_lower))) {
-        *lterm = StringValuePtr(v);
+        *lterm = rs2s(rb_obj_as_string(v));
         *include_lower = true;
     }
     if (Qnil != (v = rb_hash_aref(roptions, sym_upper))) {
-        *uterm = StringValuePtr(v);
+        *uterm = rs2s(rb_obj_as_string(v));
         *include_upper = true;
     }
     if (Qnil != (v = rb_hash_aref(roptions, sym_lower_exclusive))) {
-        *lterm = StringValuePtr(v);
+        *lterm = rs2s(rb_obj_as_string(v));
         *include_lower = false;
     }
     if (Qnil != (v = rb_hash_aref(roptions, sym_upper_exclusive))) {
-        *uterm = StringValuePtr(v);
+        *uterm = rs2s(rb_obj_as_string(v));
         *include_upper = false;
     }
     if (Qnil != (v = rb_hash_aref(roptions, sym_include_lower))) {
@@ -1028,19 +1076,19 @@ get_range_params(VALUE roptions, char **lterm, char **uterm,
         *include_upper = RTEST(v);
     }
     if (Qnil != (v = rb_hash_aref(roptions, sym_greater_than))) {
-        *lterm = StringValuePtr(v);
+        *lterm = rs2s(rb_obj_as_string(v));
         *include_lower = false;
     }
     if (Qnil != (v = rb_hash_aref(roptions, sym_greater_than_or_equal_to))) {
-        *lterm = StringValuePtr(v);
+        *lterm = rs2s(rb_obj_as_string(v));
         *include_lower = true;
     }
     if (Qnil != (v = rb_hash_aref(roptions, sym_less_than))) {
-        *uterm = StringValuePtr(v);
+        *uterm = rs2s(rb_obj_as_string(v));
         *include_upper = false;
     }
     if (Qnil != (v = rb_hash_aref(roptions, sym_less_than_or_equal_to))) {
-        *uterm = StringValuePtr(v);
+        *uterm = rs2s(rb_obj_as_string(v));
         *include_upper = true;
     }
     if (!*lterm && !*uterm) {
@@ -1055,11 +1103,6 @@ get_range_params(VALUE roptions, char **lterm, char **uterm,
         rb_raise(rb_eArgError,
                  "The upper bound should not be nil if it is inclusive");
     }
-    if (*uterm && *lterm && (strcmp(*uterm, *lterm) < 0)) {
-        rb_raise(rb_eArgError,
-                 "The upper bound should greater than the lower bound."
-                 " %s > %s", *lterm, *uterm);
-    }
 }
 
 /*
@@ -1083,9 +1126,10 @@ get_range_params(VALUE roptions, char **lterm, char **uterm,
  *    q = RangeQuery.new(:date, :lower => "200501", :upper => 200502)
  *    # is equivalent to
  *    q = RangeQuery.new(:date, :>= => "200501", :<= => 200502)
+ *
  */
 static VALUE
-frt_rq_init(VALUE self, VALUE rfield, VALUE roptions)
+frb_rq_init(VALUE self, VALUE rfield, VALUE roptions)
 {
     Query *q;
     char *lterm = NULL;
@@ -1094,10 +1138,62 @@ frt_rq_init(VALUE self, VALUE rfield, VALUE roptions)
     bool include_upper = false;
     
     get_range_params(roptions, &lterm, &uterm, &include_lower, &include_upper);
-    q = rq_new(frt_field(rfield),
+    q = rq_new(frb_field(rfield),
                lterm, uterm,
                include_lower, include_upper);
-    Frt_Wrap_Struct(self, NULL, &frt_q_free, q);
+    Frt_Wrap_Struct(self, NULL, &frb_q_free, q);
+    object_add(q, self);
+    return self;
+}
+
+/****************************************************************************
+ *
+ * TypedRangeQuery Methods
+ *
+ ****************************************************************************/
+
+/*
+ *  call-seq:
+ *     TypedRangeQuery.new(field, options = {}) -> range_query
+ *
+ *  Create a new TypedRangeQuery on field +field+. This differs from the
+ *  standard RangeQuery in that it allows range queries with unpadded numbers,
+ *  both positive and negative, integer and float. You can even use
+ *  hexadecimal numbers. However it could be a lot slower than the standard
+ *  RangeQuery on large indexes.
+ *
+ *  There are two ways to build a range query. With the old-style options;
+ *  +:lower+, +:upper+, +:include_lower+ and +:include_upper+ or the new style
+ *  options; +:<+, +:<=+, +:>+ and +:>=+. The options' names should speak for
+ *  themselves.  In the old-style options, limits are inclusive by default.
+ *
+ *  == Examples
+ *
+ *    q = TypedRangeQuery.new(:date, :lower => "0.1", :include_lower => false)
+ *    # is equivalent to
+ *    q = TypedRangeQuery.new(:date, :< => "0.1")
+ *    # is equivalent to
+ *    q = TypedRangeQuery.new(:date, :lower_exclusive => "0.1")
+ *
+ *    # Note that you numbers can be strings or actual numbers
+ *    q = TypedRangeQuery.new(:date, :lower => "-12.32", :upper => 0.21)
+ *    # is equivalent to
+ *    q = TypedRangeQuery.new(:date, :>= => "-12.32", :<= => 0.21)
+ */
+static VALUE
+frb_trq_init(VALUE self, VALUE rfield, VALUE roptions)
+{
+    Query *q;
+    char *lterm = NULL;
+    char *uterm = NULL;
+    bool include_lower = false;
+    bool include_upper = false;
+    
+    get_range_params(roptions, &lterm, &uterm, &include_lower, &include_upper);
+    q = trq_new(frb_field(rfield),
+                lterm, uterm,
+                include_lower, include_upper);
+    Frt_Wrap_Struct(self, NULL, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -1116,16 +1212,16 @@ frt_rq_init(VALUE self, VALUE rfield, VALUE roptions)
  *  the query it will do anything of value. See PhraseQuery#add_term.
  */
 static VALUE
-frt_phq_init(int argc, VALUE *argv, VALUE self)
+frb_phq_init(int argc, VALUE *argv, VALUE self)
 {
     VALUE rfield, rslop;
     Query *q;
     rb_scan_args(argc, argv, "11", &rfield, &rslop);
-    q = phq_new(frt_field(rfield));
+    q = phq_new(frb_field(rfield));
     if (argc == 2) {
         ((PhraseQuery *)q)->slop = FIX2INT(rslop);
     }
-    Frt_Wrap_Struct(self, NULL, &frt_q_free, q);
+    Frt_Wrap_Struct(self, NULL, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -1147,7 +1243,7 @@ frt_phq_init(int argc, VALUE *argv, VALUE self)
  *    # doesn't match => "big house"
  */
 static VALUE
-frt_phq_add(int argc, VALUE *argv, VALUE self)
+frb_phq_add(int argc, VALUE *argv, VALUE self)
 {
     VALUE rterm, rpos_inc;
     int pos_inc = 1;
@@ -1165,15 +1261,15 @@ frt_phq_add(int argc, VALUE *argv, VALUE self)
             {
                 int i;
                 char *t;
-                if (RARRAY(rterm)->len < 1) {
+                if (RARRAY_LEN(rterm) < 1) {
                     rb_raise(rb_eArgError, "Cannot add empty array to a "
                              "PhraseQuery. You must add either a string or "
                              "an array of strings");
                 }
-                t = StringValuePtr(RARRAY(rterm)->ptr[0]);
+                t = StringValuePtr(RARRAY_PTR(rterm)[0]);
                 phq_add_term(q, t, pos_inc);
-                for (i = 1; i < RARRAY(rterm)->len; i++) {
-                    t = StringValuePtr(RARRAY(rterm)->ptr[i]);
+                for (i = 1; i < RARRAY_LEN(rterm); i++) {
+                    t = StringValuePtr(RARRAY_PTR(rterm)[i]);
                     phq_append_multi_term(q, t);
                 }
                 break;
@@ -1194,7 +1290,7 @@ frt_phq_add(int argc, VALUE *argv, VALUE self)
  *  description for more information on slop
  */
 static VALUE
-frt_phq_get_slop(VALUE self)
+frb_phq_get_slop(VALUE self)
 {
     GET_Q();
     return INT2FIX(((PhraseQuery *)q)->slop);
@@ -1208,7 +1304,7 @@ frt_phq_get_slop(VALUE self)
  *  for more information on slop
  */
 static VALUE
-frt_phq_set_slop(VALUE self, VALUE rslop)
+frb_phq_set_slop(VALUE self, VALUE rslop)
 {
     GET_Q();
     ((PhraseQuery *)q)->slop = FIX2INT(rslop);
@@ -1238,9 +1334,9 @@ frt_phq_set_slop(VALUE self, VALUE rslop)
  *  By default it is set to 512.
  */
 static VALUE
-frt_prq_init(int argc, VALUE *argv, VALUE self)
+frb_prq_init(int argc, VALUE *argv, VALUE self)
 {
-    return frt_mtq_init_specific(argc, argv, self, &prefixq_new);
+    return frb_mtq_init_specific(argc, argv, self, &prefixq_new);
 }
 
 /****************************************************************************
@@ -1268,9 +1364,9 @@ frt_prq_init(int argc, VALUE *argv, VALUE self)
  *  query.  By default it is set to 512.
  */
 static VALUE
-frt_wcq_init(int argc, VALUE *argv, VALUE self)
+frb_wcq_init(int argc, VALUE *argv, VALUE self)
 {
-    return frt_mtq_init_specific(argc, argv, self, &wcq_new);
+    return frb_mtq_init_specific(argc, argv, self, &wcq_new);
 }
 
 /****************************************************************************
@@ -1320,7 +1416,7 @@ frt_wcq_init(int argc, VALUE *argv, VALUE self)
  *                    +:min_similarity+ to a very low value.
  */
 static VALUE
-frt_fq_init(int argc, VALUE *argv, VALUE self)
+frb_fq_init(int argc, VALUE *argv, VALUE self)
 {
     Query *q;
     VALUE rfield, rterm, roptions;
@@ -1362,9 +1458,9 @@ frt_fq_init(int argc, VALUE *argv, VALUE self)
                  "%d < 0. :max_terms must be >= 0", max_terms);
     }
 
-    q = fuzq_new_conf(frt_field(rfield), StringValuePtr(rterm),
+    q = fuzq_new_conf(frb_field(rfield), StringValuePtr(rterm),
                       min_sim, pre_len, max_terms);
-    Frt_Wrap_Struct(self, NULL, &frt_q_free, q);
+    Frt_Wrap_Struct(self, NULL, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -1376,7 +1472,7 @@ frt_fq_init(int argc, VALUE *argv, VALUE self)
  *  Get the +:prefix_length+ for the query.
  */
 static VALUE
-frt_fq_pre_len(VALUE self)
+frb_fq_pre_len(VALUE self)
 {
     GET_Q();
     return INT2FIX(((FuzzyQuery *)q)->pre_len);
@@ -1389,7 +1485,7 @@ frt_fq_pre_len(VALUE self)
  *  Get the +:min_similarity+ for the query.
  */
 static VALUE
-frt_fq_min_sim(VALUE self)
+frb_fq_min_sim(VALUE self)
 {
     GET_Q();
     return rb_float_new((double)((FuzzyQuery *)q)->min_sim);
@@ -1402,7 +1498,7 @@ frt_fq_min_sim(VALUE self)
  *  Get the default value for +:min_similarity+
  */
 static VALUE
-frt_fq_get_dms(VALUE self)
+frb_fq_get_dms(VALUE self)
 {
     return rb_cvar_get(cFuzzyQuery, id_default_min_similarity);
 }
@@ -1415,7 +1511,7 @@ extern float qp_default_fuzzy_min_sim;
  *  Set the default value for +:min_similarity+
  */
 static VALUE
-frt_fq_set_dms(VALUE self, VALUE val)
+frb_fq_set_dms(VALUE self, VALUE val)
 {
     double min_sim = NUM2DBL(val);
     if (min_sim >= 1.0) {
@@ -1426,7 +1522,11 @@ frt_fq_set_dms(VALUE self, VALUE val)
                  "%f < 0.0. :min_similarity must be > 0.0", min_sim);
     }
     qp_default_fuzzy_min_sim = (float)min_sim;
+#ifdef FRT_RUBY_VERSION_1_9
+    rb_cvar_set(cFuzzyQuery, id_default_min_similarity, val);
+#else
     rb_cvar_set(cFuzzyQuery, id_default_min_similarity, val, Qfalse);
+#endif
     return val;
 }
 
@@ -1437,7 +1537,7 @@ frt_fq_set_dms(VALUE self, VALUE val)
  *  Get the default value for +:prefix_length+
  */
 static VALUE
-frt_fq_get_dpl(VALUE self)
+frb_fq_get_dpl(VALUE self)
 {
     return rb_cvar_get(cFuzzyQuery, id_default_prefix_length);
 }
@@ -1450,7 +1550,7 @@ extern int qp_default_fuzzy_pre_len;
  *  Set the default value for +:prefix_length+
  */
 static VALUE
-frt_fq_set_dpl(VALUE self, VALUE val)
+frb_fq_set_dpl(VALUE self, VALUE val)
 {
     int pre_len = FIX2INT(val);
     if (pre_len < 0) {
@@ -1458,7 +1558,11 @@ frt_fq_set_dpl(VALUE self, VALUE val)
                  "%d < 0. :prefix_length must be >= 0", pre_len);
     }
     qp_default_fuzzy_pre_len = pre_len;
+#ifdef FRT_RUBY_VERSION_1_9
+    rb_cvar_set(cFuzzyQuery, id_default_prefix_length, val);
+#else
     rb_cvar_set(cFuzzyQuery, id_default_prefix_length, val, Qfalse);
+#endif
     return val;
 }
 
@@ -1470,10 +1574,10 @@ frt_fq_set_dpl(VALUE self, VALUE val)
  ****************************************************************************/
 
 static VALUE
-frt_maq_alloc(VALUE klass)
+frb_maq_alloc(VALUE klass)
 {
     Query *q = maq_new();
-    VALUE self = Data_Wrap_Struct(klass, NULL, &frt_q_free, q);
+    VALUE self = Data_Wrap_Struct(klass, NULL, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -1485,7 +1589,7 @@ frt_maq_alloc(VALUE klass)
  *  Create a query which matches all documents.
  */
 static VALUE
-frt_maq_init(VALUE self)
+frb_maq_init(VALUE self)
 {
     return self;
 }
@@ -1504,14 +1608,14 @@ frt_maq_init(VALUE self)
  *  each document a constant score.
  */
 static VALUE
-frt_csq_init(VALUE self, VALUE rfilter)
+frb_csq_init(VALUE self, VALUE rfilter)
 {
     Query *q;
     Filter *filter;
     Data_Get_Struct(rfilter, Filter, filter);
     q = csq_new(filter);
 
-    Frt_Wrap_Struct(self, NULL, &frt_q_free, q);
+    Frt_Wrap_Struct(self, NULL, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -1523,11 +1627,11 @@ frt_csq_init(VALUE self, VALUE rfilter)
  ****************************************************************************/
 
 static void
-frt_fqq_mark(void *p)
+frb_fqq_mark(void *p)
 {
     FilteredQuery *fq = (FilteredQuery *)p;
-    frt_gc_mark(fq->query);
-    frt_gc_mark(fq->filter);
+    frb_gc_mark(fq->query);
+    frb_gc_mark(fq->filter);
 }
 
 /*
@@ -1537,7 +1641,7 @@ frt_fqq_mark(void *p)
  *  Create a new FilteredQuery which filters +query+ with +filter+.
  */
 static VALUE
-frt_fqq_init(VALUE self, VALUE rquery, VALUE rfilter)
+frb_fqq_init(VALUE self, VALUE rquery, VALUE rfilter)
 {
     Query *sq, *q;
     Filter *f;
@@ -1546,7 +1650,7 @@ frt_fqq_init(VALUE self, VALUE rquery, VALUE rfilter)
     q = fq_new(sq, f);
     REF(sq);
     REF(f);
-    Frt_Wrap_Struct(self, &frt_fqq_mark, &frt_q_free, q);
+    Frt_Wrap_Struct(self, &frb_fqq_mark, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -1565,10 +1669,10 @@ frt_fqq_init(VALUE self, VALUE rquery, VALUE rfilter)
  *  +term+ in the field +field+.
  */
 static VALUE
-frt_spantq_init(VALUE self, VALUE rfield, VALUE rterm)
+frb_spantq_init(VALUE self, VALUE rfield, VALUE rterm)
 {
-    Query *q = spantq_new(frt_field(rfield), StringValuePtr(rterm));
-    Frt_Wrap_Struct(self, NULL, &frt_q_free, q);
+    Query *q = spantq_new(frb_field(rfield), StringValuePtr(rterm));
+    Frt_Wrap_Struct(self, NULL, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -1587,14 +1691,14 @@ frt_spantq_init(VALUE self, VALUE rfield, VALUE rterm)
  *  +terms+ in the field +field+. +terms+ should be an array of Strings.
  */
 static VALUE
-frt_spanmtq_init(VALUE self, VALUE rfield, VALUE rterms)
+frb_spanmtq_init(VALUE self, VALUE rfield, VALUE rterms)
 {
-    Query *q = spanmtq_new(frt_field(rfield));
+    Query *q = spanmtq_new(frb_field(rfield));
     int i;
-    for (i = RARRAY(rterms)->len - 1; i >= 0; i--) {
-        spanmtq_add_term(q, StringValuePtr(RARRAY(rterms)->ptr[i]));
+    for (i = RARRAY_LEN(rterms) - 1; i >= 0; i--) {
+        spanmtq_add_term(q, StringValuePtr(RARRAY_PTR(rterms)[i]));
     }
-    Frt_Wrap_Struct(self, NULL, &frt_q_free, q);
+    Frt_Wrap_Struct(self, NULL, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -1613,7 +1717,7 @@ frt_spanmtq_init(VALUE self, VALUE rfield, VALUE rterms)
  *  +prefix+ in the field +field+.
  */
 static VALUE
-frt_spanprq_init(int argc, VALUE *argv, VALUE self)
+frb_spanprq_init(int argc, VALUE *argv, VALUE self)
 {
     VALUE rfield, rprefix, rmax_terms;
     int max_terms = SPAN_PREFIX_QUERY_MAX_TERMS;
@@ -1621,9 +1725,9 @@ frt_spanprq_init(int argc, VALUE *argv, VALUE self)
     if (rb_scan_args(argc, argv, "21", &rfield, &rprefix, &rmax_terms) == 3) {
         max_terms = FIX2INT(rmax_terms);
     }
-    q = spanprq_new(frt_field(rfield), StringValuePtr(rprefix));
+    q = spanprq_new(frb_field(rfield), StringValuePtr(rprefix));
     ((SpanPrefixQuery *)q)->max_terms = max_terms;
-    Frt_Wrap_Struct(self, NULL, &frt_q_free, q);
+    Frt_Wrap_Struct(self, NULL, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -1643,13 +1747,13 @@ frt_spanprq_init(int argc, VALUE *argv, VALUE self)
  *  field
  */
 static VALUE
-frt_spanfq_init(VALUE self, VALUE rmatch, VALUE rend)
+frb_spanfq_init(VALUE self, VALUE rmatch, VALUE rend)
 {
     Query *q;
     Query *match;
     Data_Get_Struct(rmatch, Query, match);
     q = spanfq_new(match, FIX2INT(rend));
-    Frt_Wrap_Struct(self, NULL, &frt_q_free, q);
+    Frt_Wrap_Struct(self, NULL, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -1661,12 +1765,12 @@ frt_spanfq_init(VALUE self, VALUE rmatch, VALUE rend)
  ****************************************************************************/
 
 static void
-frt_spannq_mark(void *p)
+frb_spannq_mark(void *p)
 {
     int i;
     SpanNearQuery *snq = (SpanNearQuery *)p;
     for (i = 0; i < snq->c_cnt; i++) {
-        frt_gc_mark(snq->clauses[i]);
+        frb_gc_mark(snq->clauses[i]);
     }
 }
 
@@ -1693,7 +1797,7 @@ frt_spannq_mark(void *p)
  *              set to 0, this parameter will make no difference.
  */
 static VALUE
-frt_spannq_init(int argc, VALUE *argv, VALUE self)
+frb_spannq_init(int argc, VALUE *argv, VALUE self)
 {
     Query *q;
     VALUE roptions;
@@ -1716,14 +1820,14 @@ frt_spannq_init(int argc, VALUE *argv, VALUE self)
             int i;
             Query *clause;
             Check_Type(v, T_ARRAY);
-            for (i = 0; i < RARRAY(v)->len; i++) {
-                Data_Get_Struct(RARRAY(v)->ptr[i], Query, clause);
+            for (i = 0; i < RARRAY_LEN(v); i++) {
+                Data_Get_Struct(RARRAY_PTR(v)[i], Query, clause);
                 spannq_add_clause(q, clause);
             }
         }
     }
 
-    Frt_Wrap_Struct(self, &frt_spannq_mark, &frt_q_free, q);
+    Frt_Wrap_Struct(self, &frb_spannq_mark, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -1738,7 +1842,7 @@ frt_spannq_init(int argc, VALUE *argv, VALUE self)
  *  must be SpanQueries, not other types of query.
  */
 static VALUE
-frt_spannq_add(VALUE self, VALUE rclause)
+frb_spannq_add(VALUE self, VALUE rclause)
 {
     GET_Q();
     Query *clause;
@@ -1754,12 +1858,12 @@ frt_spannq_add(VALUE self, VALUE rclause)
  ****************************************************************************/
 
 static void
-frt_spanoq_mark(void *p)
+frb_spanoq_mark(void *p)
 {
     int i;
     SpanOrQuery *soq = (SpanOrQuery *)p;
     for (i = 0; i < soq->c_cnt; i++) {
-        frt_gc_mark(soq->clauses[i]);
+        frb_gc_mark(soq->clauses[i]);
     }
 }
 
@@ -1772,7 +1876,7 @@ frt_spanoq_mark(void *p)
  *  passed to other SpanQuerys like SpanNearQuery.
  */
 static VALUE
-frt_spanoq_init(int argc, VALUE *argv, VALUE self)
+frb_spanoq_init(int argc, VALUE *argv, VALUE self)
 {
     Query *q;
     VALUE rclauses;
@@ -1782,12 +1886,12 @@ frt_spanoq_init(int argc, VALUE *argv, VALUE self)
         int i;
         Query *clause;
         Check_Type(rclauses, T_ARRAY);
-        for (i = 0; i < RARRAY(rclauses)->len; i++) {
-            Data_Get_Struct(RARRAY(rclauses)->ptr[i], Query, clause);
+        for (i = 0; i < RARRAY_LEN(rclauses); i++) {
+            Data_Get_Struct(RARRAY_PTR(rclauses)[i], Query, clause);
             spanoq_add_clause(q, clause);
         }
     }
-    Frt_Wrap_Struct(self, &frt_spanoq_mark, &frt_q_free, q);
+    Frt_Wrap_Struct(self, &frb_spanoq_mark, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -1801,7 +1905,7 @@ frt_spanoq_init(int argc, VALUE *argv, VALUE self)
  *  not other types of query.
  */
 static VALUE
-frt_spanoq_add(VALUE self, VALUE rclause)
+frb_spanoq_add(VALUE self, VALUE rclause)
 {
     GET_Q();
     Query *clause;
@@ -1817,11 +1921,11 @@ frt_spanoq_add(VALUE self, VALUE rclause)
  ****************************************************************************/
 
 static void
-frt_spanxq_mark(void *p)
+frb_spanxq_mark(void *p)
 {
     SpanNotQuery *sxq = (SpanNotQuery *)p;
-    frt_gc_mark(sxq->inc);
-    frt_gc_mark(sxq->exc);
+    frb_gc_mark(sxq->inc);
+    frb_gc_mark(sxq->exc);
 }
 
 /*
@@ -1832,13 +1936,13 @@ frt_spanxq_mark(void *p)
  *  +include_query+ and don't match +exclude_query+.
  */
 static VALUE
-frt_spanxq_init(VALUE self, VALUE rinc, VALUE rexc)
+frb_spanxq_init(VALUE self, VALUE rinc, VALUE rexc)
 {
     Query *q;
     Check_Type(rinc, T_DATA);
     Check_Type(rexc, T_DATA);
     q = spanxq_new(DATA_PTR(rinc), DATA_PTR(rexc));
-    Frt_Wrap_Struct(self, &frt_spanxq_mark, &frt_q_free, q);
+    Frt_Wrap_Struct(self, &frb_spanxq_mark, &frb_q_free, q);
     object_add(q, self);
     return self;
 }
@@ -1850,7 +1954,7 @@ frt_spanxq_init(VALUE self, VALUE rinc, VALUE rexc)
  ****************************************************************************/
 
 static void
-frt_f_free(void *p)
+frb_f_free(void *p)
 {
     object_del(p);
     filt_deref((Filter *)p);
@@ -1866,7 +1970,7 @@ frt_f_free(void *p)
  *  method was called on.
  */
 static VALUE
-frt_f_to_s(VALUE self)
+frb_f_to_s(VALUE self)
 {
     VALUE rstr;
     char *str;
@@ -1877,7 +1981,7 @@ frt_f_to_s(VALUE self)
     return rstr;
 }
 
-extern VALUE frt_get_bv(BitVector *bv);
+extern VALUE frb_get_bv(BitVector *bv);
 
 /*
  *  call-seq:
@@ -1887,14 +1991,14 @@ extern VALUE frt_get_bv(BitVector *bv);
  *  to group filters or apply filters to other filters.
  */
 static VALUE
-frt_f_get_bits(VALUE self, VALUE rindex_reader)
+frb_f_get_bits(VALUE self, VALUE rindex_reader)
 {
     BitVector *bv;
     IndexReader *ir;
     GET_F();
     Data_Get_Struct(rindex_reader, IndexReader, ir);
     bv = filt_get_bv(f, ir);
-    return frt_get_bv(bv);
+    return frb_get_bv(bv);
 }
 
 /****************************************************************************
@@ -1927,7 +2031,7 @@ frt_f_get_bits(VALUE self, VALUE rindex_reader)
  *    f = RangeFilter.new(:date, :>= => "200501", :<= => 200502)
  */
 static VALUE
-frt_rf_init(VALUE self, VALUE rfield, VALUE roptions)
+frb_rf_init(VALUE self, VALUE rfield, VALUE roptions)
 {
     Filter *f;
     char *lterm = NULL;
@@ -1936,9 +2040,56 @@ frt_rf_init(VALUE self, VALUE rfield, VALUE roptions)
     bool include_upper = false;
     
     get_range_params(roptions, &lterm, &uterm, &include_lower, &include_upper);
-    f = rfilt_new(frt_field(rfield), lterm, uterm,
+    f = rfilt_new(frb_field(rfield), lterm, uterm,
                   include_lower, include_upper);
-    Frt_Wrap_Struct(self, NULL, &frt_f_free, f);
+    Frt_Wrap_Struct(self, NULL, &frb_f_free, f);
+    object_add(f, self);
+    return self;
+}
+
+/****************************************************************************
+ *
+ * TypedRangeFilter Methods
+ *
+ ****************************************************************************/
+
+
+/*
+ *  call-seq:
+ *     TypedRangeFilter.new(field, options = {}) -> range_query
+ *
+ *  Create a new TypedRangeFilter on field +field+. There are two ways to
+ *  build a range filter. With the old-style options; +:lower+, +:upper+,
+ *  +:include_lower+ and +:include_upper+ or the new style options; +:<+,
+ *  +:<=+, +:>+ and +:>=+. The options' names should speak for themselves.
+ *  In the old-style options, limits are inclusive by default.
+ *
+ *  == Examples
+ *
+ *    f = TypedRangeFilter.new(:date, :lower => "0.1", :include_lower => false)
+ *    # is equivalent to 
+ *    f = TypedRangeFilter.new(:date, :< => "0.1")
+ *    # is equivalent to 
+ *    f = TypedRangeFilter.new(:date, :lower_exclusive => "0.1")
+ *
+ *    # Note that you numbers can be strings or actual numbers
+ *    f = TypedRangeFilter.new(:date, :lower => "-132.2", :upper => -1.4)
+ *    # is equivalent to 
+ *    f = TypedRangeFilter.new(:date, :>= => "-132.2", :<= => -1.4)
+ */
+static VALUE
+frb_trf_init(VALUE self, VALUE rfield, VALUE roptions)
+{
+    Filter *f;
+    char *lterm = NULL;
+    char *uterm = NULL;
+    bool include_lower = false;
+    bool include_upper = false;
+    
+    get_range_params(roptions, &lterm, &uterm, &include_lower, &include_upper);
+    f = trfilt_new(frb_field(rfield), lterm, uterm,
+                   include_lower, include_upper);
+    Frt_Wrap_Struct(self, NULL, &frb_f_free, f);
     object_add(f, self);
     return self;
 }
@@ -1956,13 +2107,13 @@ frt_rf_init(VALUE self, VALUE rfield, VALUE roptions)
  *  Create a new QueryFilter which applies the query +query+.
  */
 static VALUE
-frt_qf_init(VALUE self, VALUE rquery)
+frb_qf_init(VALUE self, VALUE rquery)
 {
     Query *q;
     Filter *f;
     Data_Get_Struct(rquery, Query, q);
     f = qfilt_new(q);
-    Frt_Wrap_Struct(self, NULL, &frt_f_free, f);
+    Frt_Wrap_Struct(self, NULL, &frb_f_free, f);
     object_add(f, self);
     return self;
 }
@@ -1974,18 +2125,18 @@ frt_qf_init(VALUE self, VALUE rquery)
  ****************************************************************************/
 
 static void 
-frt_sf_free(void *p)
+frb_sf_free(void *p)
 {
     object_del(p);
     sort_field_destroy((SortField *)p);
 }
 
 static VALUE
-frt_get_sf(SortField *sf)
+frb_get_sf(SortField *sf)
 {
     VALUE self = object_get(sf);
     if (self == Qnil) {
-        self = Data_Wrap_Struct(cSortField, NULL, &frt_sf_free, sf);
+        self = Data_Wrap_Struct(cSortField, NULL, &frb_sf_free, sf);
         object_add(sf, self);
     }
     return self;
@@ -2038,14 +2189,14 @@ get_sort_type(VALUE rtype)
  *                  sort.
  */
 static VALUE
-frt_sf_init(int argc, VALUE *argv, VALUE self)
+frb_sf_init(int argc, VALUE *argv, VALUE self)
 {
     SortField *sf;
     VALUE rfield, roptions;
     VALUE rval;
     int type = SORT_TYPE_AUTO;
     int is_reverse = false;
-    char *field;
+    Symbol field;
 
     if (rb_scan_args(argc, argv, "11", &rfield, &roptions) == 2) {
         if (Qnil != (rval = rb_hash_aref(roptions, sym_type))) {
@@ -2059,14 +2210,14 @@ frt_sf_init(int argc, VALUE *argv, VALUE self)
         }
     }
     if (NIL_P(rfield)) rb_raise(rb_eArgError, "must pass a valid field name");
-    field = frt_field(rfield);
+    field = frb_field(rfield);
 
     sf = sort_field_new(field, type, is_reverse);
-    if (sf->field == NULL && field) {
-        sf->field = estrdup(field);
+    if (sf->field == NULL) {
+        sf->field = field;
     }
 
-    Frt_Wrap_Struct(self, NULL, &frt_sf_free, sf);
+    Frt_Wrap_Struct(self, NULL, &frb_sf_free, sf);
     object_add(sf, self);
     return self;
 }
@@ -2081,7 +2232,7 @@ frt_sf_init(int argc, VALUE *argv, VALUE self)
  *  when you create the sort_field.
  */
 static VALUE
-frt_sf_is_reverse(VALUE self)
+frb_sf_is_reverse(VALUE self)
 {
     GET_SF();
     return sf->reverse ? Qtrue : Qfalse;
@@ -2094,10 +2245,10 @@ frt_sf_is_reverse(VALUE self)
  *  Returns the name of the field to be sorted.
  */
 static VALUE
-frt_sf_get_name(VALUE self)
+frb_sf_get_name(VALUE self)
 {
     GET_SF();
-    return sf->field ? ID2SYM(rb_intern(sf->field)) : Qnil;
+    return sf->field ? FSYM2SYM(sf->field) : Qnil;
 }
 
 /*
@@ -2108,7 +2259,7 @@ frt_sf_get_name(VALUE self)
  *  +:string+, +:byte+, +:doc_id+ or +:score+.
  */
 static VALUE
-frt_sf_get_type(VALUE self)
+frb_sf_get_type(VALUE self)
 {
     GET_SF();
     switch (sf->type) {
@@ -2130,7 +2281,7 @@ frt_sf_get_type(VALUE self)
  *  TODO: currently unsupported
  */
 static VALUE
-frt_sf_get_comparator(VALUE self)
+frb_sf_get_comparator(VALUE self)
 {
     return Qnil;
 }
@@ -2142,7 +2293,7 @@ frt_sf_get_comparator(VALUE self)
  *  Return a human readable string describing this +sort_field+.
  */
 static VALUE
-frt_sf_to_s(VALUE self)
+frb_sf_to_s(VALUE self)
 {
     GET_SF();
     char *str = sort_field_to_s(sf);
@@ -2158,7 +2309,7 @@ frt_sf_to_s(VALUE self)
  ****************************************************************************/
 
 static void 
-frt_sort_free(void *p)
+frb_sort_free(void *p)
 {
     Sort *sort = (Sort *)p;
     object_del(sort);
@@ -2166,28 +2317,28 @@ frt_sort_free(void *p)
 }
 
 static void 
-frt_sort_mark(void *p)
+frb_sort_mark(void *p)
 {
     Sort *sort = (Sort *)p;
     int i;
     for (i = 0; i < sort->size; i++) {
-        frt_gc_mark(sort->sort_fields[i]);
+        frb_gc_mark(sort->sort_fields[i]);
     }
 }
 
 static VALUE
-frt_sort_alloc(VALUE klass)
+frb_sort_alloc(VALUE klass)
 {
     VALUE self;
     Sort *sort = sort_new();
     sort->destroy_all = false;
-    self = Data_Wrap_Struct(klass, &frt_sort_mark, &frt_sort_free, sort);
+    self = Data_Wrap_Struct(klass, &frb_sort_mark, &frb_sort_free, sort);
     object_add(sort, self);
     return self;
 }
 
 static void
-frt_parse_sort_str(Sort *sort, char *xsort_str)
+frb_parse_sort_str(Sort *sort, char *xsort_str)
 {
     SortField *sf;
     char *comma, *end, *e, *s;
@@ -2219,9 +2370,9 @@ frt_parse_sort_str(Sort *sort, char *xsort_str)
         } else if (strcmp("DOC_ID", s) == 0) {
             sf = sort_field_doc_new(reverse);
         } else {
-            sf = sort_field_auto_new(s, reverse);
+            sf = sort_field_auto_new(I(s), reverse);
         }
-        frt_get_sf(sf);
+        frb_get_sf(sf);
         sort_add_sort_field(sort, sf);
         s = comma + 1;
     }
@@ -2229,7 +2380,7 @@ frt_parse_sort_str(Sort *sort, char *xsort_str)
 }
 
 static void
-frt_sort_add(Sort *sort, VALUE rsf, bool reverse)
+frb_sort_add(Sort *sort, VALUE rsf, bool reverse)
 {
     SortField *sf;
     switch (TYPE(rsf)) {
@@ -2239,15 +2390,14 @@ frt_sort_add(Sort *sort, VALUE rsf, bool reverse)
             sort_add_sort_field(sort, sf);
             break;
         case T_SYMBOL:
-            rsf = rb_obj_as_string(rsf);
-            sf = sort_field_auto_new(rs2s(rsf), reverse);
+            sf = sort_field_auto_new(frb_field(rsf), reverse);
             /* need to give it a ruby object so it'll be freed when the
              * sort is garbage collected */
-            rsf = frt_get_sf(sf);
+            rsf = frb_get_sf(sf);
             sort_add_sort_field(sort, sf);
             break;
         case T_STRING:
-            frt_parse_sort_str(sort, rs2s(rsf));
+            frb_parse_sort_str(sort, rs2s(rsf));
             break;
         default:
             rb_raise(rb_eArgError, "Unknown SortField Type");
@@ -2265,7 +2415,7 @@ frt_sort_add(Sort *sort, VALUE rsf, bool reverse)
  *  to their natural order again. By default 
  */
 static VALUE
-frt_sort_init(int argc, VALUE *argv, VALUE self)
+frb_sort_init(int argc, VALUE *argv, VALUE self)
 {
     int i;
     VALUE rfields, rreverse;
@@ -2277,11 +2427,11 @@ frt_sort_init(int argc, VALUE *argv, VALUE self)
         case 1: 
                 if (TYPE(rfields) == T_ARRAY) {
                     int i;
-                    for (i = 0; i < RARRAY(rfields)->len; i++) {
-                        frt_sort_add(sort, RARRAY(rfields)->ptr[i], reverse);
+                    for (i = 0; i < RARRAY_LEN(rfields); i++) {
+                        frb_sort_add(sort, RARRAY_PTR(rfields)[i], reverse);
                     }
                 } else {
-                    frt_sort_add(sort, rfields, reverse);
+                    frb_sort_add(sort, rfields, reverse);
                 }
                 for (i = 0; i < sort->size; i++) {
                     if (sort->sort_fields[i] == &SORT_FIELD_DOC) has_sfd = true;
@@ -2305,7 +2455,7 @@ frt_sort_init(int argc, VALUE *argv, VALUE self)
  *  Returns an array of the SortFields held by the Sort object.
  */
 static VALUE
-frt_sort_get_fields(VALUE self)
+frb_sort_get_fields(VALUE self)
 {
     GET_SORT();
     VALUE rfields = rb_ary_new2(sort->size);
@@ -2324,7 +2474,7 @@ frt_sort_get_fields(VALUE self)
  *  Returns a human readable string representing the sort object.
  */
 static VALUE
-frt_sort_to_s(VALUE self)
+frb_sort_to_s(VALUE self)
 {
     GET_SORT();
     char *str = sort_to_s(sort);
@@ -2340,7 +2490,7 @@ frt_sort_to_s(VALUE self)
  ****************************************************************************/
 
 static void
-frt_sea_free(void *p)
+frb_sea_free(void *p)
 {
     Searcher *sea = (Searcher *)p;
     object_del(sea);
@@ -2357,7 +2507,7 @@ frt_sea_free(void *p)
  *  call this method explicitly.
  */
 static VALUE
-frt_sea_close(VALUE self)
+frb_sea_close(VALUE self)
 {
     GET_SEA();
     Frt_Unwrap_Struct(self);
@@ -2373,7 +2523,7 @@ frt_sea_close(VALUE self)
  *  Return the IndexReader wrapped by this searcher.
  */
 static VALUE
-frt_sea_get_reader(VALUE self, VALUE rterm)
+frb_sea_get_reader(VALUE self, VALUE rterm)
 {
     GET_SEA();
     return object_get(((IndexSearcher *)sea)->ir);
@@ -2387,11 +2537,11 @@ frt_sea_get_reader(VALUE self, VALUE rterm)
  *  field +field+.
  */
 static VALUE
-frt_sea_doc_freq(VALUE self, VALUE rfield, VALUE rterm)
+frb_sea_doc_freq(VALUE self, VALUE rfield, VALUE rterm)
 {
     GET_SEA();
     return INT2FIX(sea->doc_freq(sea,
-                                 frt_field(rfield),
+                                 frb_field(rfield),
                                  StringValuePtr(rterm)));
 }
 
@@ -2405,10 +2555,10 @@ frt_sea_doc_freq(VALUE self, VALUE rfield, VALUE rterm)
  *  which are returned by the Searchers search methods.
  */
 static VALUE
-frt_sea_doc(VALUE self, VALUE rdoc_id)
+frb_sea_doc(VALUE self, VALUE rdoc_id)
 {
     GET_SEA();
-    return frt_get_lazy_doc(sea->get_lazy_doc(sea, FIX2INT(rdoc_id)));
+    return frb_get_lazy_doc(sea->get_lazy_doc(sea, FIX2INT(rdoc_id)));
 }
 
 /*
@@ -2421,19 +2571,31 @@ frt_sea_doc(VALUE self, VALUE rdoc_id)
  *  in the index.
  */
 static VALUE
-frt_sea_max_doc(VALUE self)
+frb_sea_max_doc(VALUE self)
 {
     GET_SEA();
     return INT2FIX(sea->max_doc(sea));
 }
 
-static bool
-call_filter_proc(int doc_id, float score, Searcher *self)
-{
-    return RTEST(rb_funcall((VALUE)self->arg, id_call, 3,
-                            INT2FIX(doc_id),
-                            rb_float_new((double)score),
-                            object_get(self))); 
+static float
+call_filter_proc(int doc_id, float score, Searcher *self, void *arg)
+{
+    VALUE val = rb_funcall((VALUE)arg, id_call, 3,
+                           INT2FIX(doc_id),
+                           rb_float_new((double)score),
+                           object_get(self)); 
+    switch (TYPE(val)) {
+        case T_NIL:
+        case T_FALSE:
+            return 0.0f;
+        case T_FLOAT:
+        {
+            double d = NUM2DBL(val);
+            return (d >= 0.0 && d <= 1.0) ? (float)d : 1.0f;
+        }
+        default:
+            return 1.0f;
+    }
 }
 
 typedef struct CWrappedFilter
@@ -2466,25 +2628,25 @@ cwfilt_get_bv_i(Filter *filt, IndexReader *ir)
 }
 
 Filter *
-frt_get_cwrapped_filter(VALUE rval)
+frb_get_cwrapped_filter(VALUE rval)
 {
     Filter *filter;
-    if (frt_is_cclass(rval) && DATA_PTR(rval)) {
+    if (frb_is_cclass(rval) && DATA_PTR(rval)) {
         Data_Get_Struct(rval, Filter, filter);
         REF(filter);
     }
     else {
-        filter = filt_create(sizeof(CWrappedFilter), "CWrappedFilter");
-        filter->hash     = &cwfilt_hash;
-        filter->eq       = &cwfilt_eq;
-        filter->get_bv_i = &cwfilt_get_bv_i;
+        filter               = filt_new(CWrappedFilter);
+        filter->hash         = &cwfilt_hash;
+        filter->eq           = &cwfilt_eq;
+        filter->get_bv_i     = &cwfilt_get_bv_i;
         CWF(filter)->rfilter = rval;
     }
     return filter;
 }
 
 static TopDocs *
-frt_sea_search_internal(Query *query, VALUE roptions, Searcher *sea)
+frb_sea_search_internal(Query *query, VALUE roptions, Searcher *sea)
 {
     VALUE rval;
     int offset = 0, limit = 10;
@@ -2492,7 +2654,8 @@ frt_sea_search_internal(Query *query, VALUE roptions, Searcher *sea)
     Sort *sort = NULL;
     TopDocs *td;
 
-    filter_ft filter_func = NULL;
+    PostFilter post_filter_holder;
+    PostFilter *post_filter = NULL;
 
     if (Qnil != roptions) {
         if (Qnil != (rval = rb_hash_aref(roptions, sym_offset))) {
@@ -2503,32 +2666,48 @@ frt_sea_search_internal(Query *query, VALUE roptions, Searcher *sea)
         if (Qnil != (rval = rb_hash_aref(roptions, sym_limit))) {
             if (TYPE(rval) == T_FIXNUM) {
                 limit = FIX2INT(rval);
-                if (limit <= 0)
+                if (limit <= 0) {
                     rb_raise(rb_eArgError, ":limit must be > 0");
-            } else if (rval == sym_all) {
+                }
+            }
+            else if (rval == sym_all) {
                 limit = INT_MAX;
-            } else {
+            }
+            else {
                 rb_raise(rb_eArgError, "%s is not a sensible :limit value "
                          "Please use a positive integer or :all",
-                         rb_obj_as_string(rval));
+                         rs2s(rb_obj_as_string(rval)));
             }
         }
         if (Qnil != (rval = rb_hash_aref(roptions, sym_filter))) {
-            filter = frt_get_cwrapped_filter(rval);
+            filter = frb_get_cwrapped_filter(rval);
+        }
+        if (Qnil != (rval = rb_hash_aref(roptions, sym_c_filter_proc))) {
+                post_filter = DATA_PTR(rval);
         }
         if (Qnil != (rval = rb_hash_aref(roptions, sym_filter_proc))) {
-            filter_func = &call_filter_proc;
-            sea->arg = (void *)rval;
+            if (rb_respond_to(rval, id_call)) {
+                if (post_filter) {
+                    rb_raise(rb_eArgError, "Cannot pass both :filter_proc and "
+                             ":c_filter_proc to the same search");
+                }
+                post_filter_holder.filter_func = &call_filter_proc;
+                post_filter_holder.arg = (void *)rval;
+                post_filter = &post_filter_holder;
+            }
+            else {
+                post_filter = DATA_PTR(rval);
+            }
         }
         if (Qnil != (rval = rb_hash_aref(roptions, sym_sort))) {
             if (TYPE(rval) != T_DATA || CLASS_OF(rval) == cSortField) {
-                rval = frt_sort_init(1, &rval, frt_sort_alloc(cSort));
+                rval = frb_sort_init(1, &rval, frb_sort_alloc(cSort));
             } 
             Data_Get_Struct(rval, Sort, sort);
         }
     }
 
-    td = sea->search(sea, query, offset, limit, filter, sort, filter_func, 0);
+    td = sea->search(sea, query, offset, limit, filter, sort, post_filter, 0);
     if (filter) filt_deref(filter);
     return td;
 }
@@ -2564,19 +2743,22 @@ frt_sea_search_internal(Query *query, VALUE roptions, Searcher *sea)
  *                  on this, see the documentation for SortField
  *  :filter::       a Filter object to filter the search results with
  *  :filter_proc::  a filter Proc is a Proc which takes the doc_id, the score
- *                  and the Searcher object as its parameters and returns a
- *                  Boolean value specifying whether the result should be
- *                  included in the result set.
+ *                  and the Searcher object as its parameters and returns
+ *                  either a Boolean value specifying whether the result
+ *                  should be included in the result set, or a Float between 0
+ *                  and 1.0 to be used as a factor to scale the score of the
+ *                  object. This can be used, for example, to weight the score
+ *                  of a matched document by it's age.
  */
 static VALUE
-frt_sea_search(int argc, VALUE *argv, VALUE self)
+frb_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_sea_search_internal(query, roptions, sea), self);
+    return frb_get_td(frb_sea_search_internal(query, roptions, sea), self);
 }
 
 /*
@@ -2621,7 +2803,7 @@ frt_sea_search(int argc, VALUE *argv, VALUE self)
  *                  included in the result set.
  */
 static VALUE
-frt_sea_search_each(int argc, VALUE *argv, VALUE self)
+frb_sea_search_each(int argc, VALUE *argv, VALUE self)
 {
     int i;
     Query *q;
@@ -2632,10 +2814,11 @@ frt_sea_search_each(int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "11", &rquery, &roptions);
 
+#ifndef FRT_RUBY_VERSION_1_9
     rb_thread_critical = Qtrue;
-
+#endif
     Data_Get_Struct(rquery, Query, q);
-    td = frt_sea_search_internal(q, roptions, sea);
+    td = frb_sea_search_internal(q, roptions, sea);
 
     max_score = (td->max_score > 1.0) ? td->max_score : 1.0;
 
@@ -2648,11 +2831,107 @@ frt_sea_search_each(int argc, VALUE *argv, VALUE self)
     rtotal_hits = INT2FIX(td->total_hits);
     td_destroy(td);
 
+#ifndef FRT_RUBY_VERSION_1_9
     rb_thread_critical = 0;
-
+#endif
     return rtotal_hits;
 }
 
+/*
+ *  call-seq:
+ *     searcher.scan(query, options = {}) -> Array (doc_nums)
+ *
+ *  Run a query through the Searcher on the index, ignoring scoring and
+ *  starting at +:start_doc+ and stopping when +:limit+ matches have been
+ *  found. It returns an array of the matching document numbers.
+ *
+ *  There is a big performance advange when using this search method on a very
+ *  large index when there are potentially thousands of matching documents and
+ *  you only want say 50 of them. The other search methods need to look at
+ *  every single match to decide which one has the highest score. This search
+ *  method just needs to find +:limit+ number of matches before it returns.
+ *  
+ *  === Options
+ *
+ *  :start_doc::    Default: 0. The start document to start the search from.
+ *                  NOTE very carefully that this is not the same as the
+ *                  +:offset+ parameter used in the other search methods which
+ *                  refers to the offset in the result-set. This is the
+ *                  document to start the scan from. So if you scanning
+ *                  through the index in increments of 50 documents at a time
+ *                  you need to use the last matched doc in the previous
+ *                  search to start your next search. See the example below.
+ *  :limit::        Default: 50. This is the number of results you want
+ *                  returned, also called the page size. Set +:limit+ to
+ *                  +:all+ to return all results.
+ *  TODO: add option to return loaded documents instead
+ *
+ *  === Options
+ *
+ *    start_doc = 0
+ *    begin
+ *      results = @searcher.scan(query, :start_doc => start_doc)
+ *      yield results # or do something with them
+ *      start_doc = results.last
+ *      # start_doc will be nil now if results is empty, ie no more matches
+ *    end while start_doc
+ */
+static VALUE
+frb_sea_scan(int argc, VALUE *argv, VALUE self)
+{
+    Query *q;
+    int i, count;
+    VALUE rval, rquery, roptions;
+    int *doc_array;
+    VALUE rdoc_array;
+    int start_doc = 0, limit = 50;
+    GET_SEA();
+    rb_scan_args(argc, argv, "11", &rquery, &roptions);
+    Data_Get_Struct(rquery, Query, q);
+
+    if (Qnil != roptions) {
+        Check_Type(roptions, T_HASH);
+        if (Qnil != (rval = rb_hash_aref(roptions, sym_start_doc))) {
+            Check_Type(rval, T_FIXNUM);
+            start_doc = FIX2INT(rval);
+            if (start_doc < 0) {
+                rb_raise(rb_eArgError, ":start_doc must be >= 0");
+            }
+        }
+        if (Qnil != (rval = rb_hash_aref(roptions, sym_limit))) {
+            if (TYPE(rval) == T_FIXNUM) {
+                limit = FIX2INT(rval);
+                if (limit <= 0) {
+                    rb_raise(rb_eArgError, ":limit must be > 0");
+                }
+            }
+            else if (rval == sym_all) {
+                limit = INT_MAX;
+            }
+            else {
+                rb_raise(rb_eArgError, "%s is not a sensible :limit value "
+                         "Please use a positive integer or :all",
+                         rs2s(rb_obj_as_string(rval)));
+            }
+        }
+    }
+
+#ifndef FRT_RUBY_VERSION_1_9
+    rb_thread_critical = Qtrue;
+#endif
+    doc_array = ALLOC_N(int, limit);
+    count = searcher_search_unscored(sea, q, doc_array, limit, start_doc);
+    rdoc_array = rb_ary_new2(count);
+    for (i = 0; i < count; i++) {
+      rb_ary_store(rdoc_array, i, INT2FIX(doc_array[i]));
+    }
+    free(doc_array);
+#ifndef FRT_RUBY_VERSION_1_9
+    rb_thread_critical = 0;
+#endif
+    return rdoc_array;
+}
+
 /*
  *  call-seq:
  *     searcher.explain(query, doc_id) -> Explanation
@@ -2665,7 +2944,7 @@ frt_sea_search_each(int argc, VALUE *argv, VALUE self)
  *    puts searcher.explain(query, doc_id).to_s
  */
 static VALUE
-frt_sea_explain(VALUE self, VALUE rquery, VALUE rdoc_id)
+frb_sea_explain(VALUE self, VALUE rquery, VALUE rdoc_id)
 {
     GET_SEA();
     Query *query;
@@ -2698,7 +2977,7 @@ frt_sea_explain(VALUE self, VALUE rquery, VALUE rdoc_id)
  *                      want to change this so a Unicode ellipsis character.
  */
 static VALUE
-frt_sea_highlight(int argc, VALUE *argv, VALUE self)
+frb_sea_highlight(int argc, VALUE *argv, VALUE self)
 {
     GET_SEA();
     VALUE rquery, rdoc_id, rfield, roptions, v;
@@ -2742,7 +3021,7 @@ frt_sea_highlight(int argc, VALUE *argv, VALUE self)
     if ((excerpts = searcher_highlight(sea,
                                        query,
                                        FIX2INT(rdoc_id),
-                                       frt_field(rfield),
+                                       frb_field(rfield),
                                        excerpt_length,
                                        num_excerpts,
                                        pre_tag,
@@ -2753,8 +3032,7 @@ frt_sea_highlight(int argc, VALUE *argv, VALUE self)
         VALUE rexcerpts = rb_ary_new2(size);
 
         for (i = 0; i < size; i++) {
-            RARRAY(rexcerpts)->ptr[i] = rb_str_new2(excerpts[i]);
-            RARRAY(rexcerpts)->len++;
+          rb_ary_store(rexcerpts, i, rb_str_new2(excerpts[i]));
         }
         ary_destroy(excerpts, &free);
         return rexcerpts;
@@ -2769,15 +3047,15 @@ frt_sea_highlight(int argc, VALUE *argv, VALUE self)
  ****************************************************************************/
 
 static void
-frt_sea_mark(void *p)
+frb_sea_mark(void *p)
 {
     IndexSearcher *isea = (IndexSearcher *)p;
-    frt_gc_mark(isea->ir);
-    frt_gc_mark(isea->ir->store);
+    frb_gc_mark(isea->ir);
+    frb_gc_mark(isea->ir->store);
 }
 
 #define FRT_GET_IR(rir, ir) do {\
-    rir = Data_Wrap_Struct(cIndexReader, &frt_ir_mark, &frt_ir_free, ir);\
+    rir = Data_Wrap_Struct(cIndexReader, &frb_ir_mark, &frb_ir_free, ir);\
     object_add(ir, rir);\
 } while (0)
 
@@ -2792,13 +3070,13 @@ frt_sea_mark(void *p)
  *  directories.
  */
 static VALUE
-frt_sea_init(VALUE self, VALUE obj)
+frb_sea_init(VALUE self, VALUE obj)
 {
     Store *store = NULL;
     IndexReader *ir = NULL;
     Searcher *sea;
     if (TYPE(obj) == T_STRING) {
-        frt_create_dir(obj);
+        frb_create_dir(obj);
         store = open_fs_store(StringValueCStr(obj));
         ir = ir_open(store);
         DEREF(store);
@@ -2818,7 +3096,7 @@ frt_sea_init(VALUE self, VALUE obj)
 
     sea = isea_new(ir);
     ((IndexSearcher *)sea)->close_ir = false;
-    Frt_Wrap_Struct(self, &frt_sea_mark, &frt_sea_free, sea);
+    Frt_Wrap_Struct(self, &frb_sea_mark, &frb_sea_free, sea);
     object_add(sea, self);
 
     return self;
@@ -2831,7 +3109,7 @@ frt_sea_init(VALUE self, VALUE obj)
  ****************************************************************************/
 
 static void
-frt_ms_free(void *p)
+frb_ms_free(void *p)
 {
     Searcher *sea = (Searcher *)p;
     MultiSearcher *msea = (MultiSearcher *)sea;
@@ -2841,12 +3119,12 @@ frt_ms_free(void *p)
 }
 
 static void
-frt_ms_mark(void *p)
+frb_ms_mark(void *p)
 {
     int i;
     MultiSearcher *msea = (MultiSearcher *)p;
     for (i = 0; i < msea->s_cnt; i++) {
-        frt_gc_mark(msea->searchers[i]);
+        frb_gc_mark(msea->searchers[i]);
     }
 }
 
@@ -2858,7 +3136,7 @@ frt_ms_mark(void *p)
  *  constructor.
  */
 static VALUE
-frt_ms_init(int argc, VALUE *argv, VALUE self)
+frb_ms_init(int argc, VALUE *argv, VALUE self)
 {
     int i, j, top = 0, capa = argc;
 
@@ -2870,10 +3148,10 @@ frt_ms_init(int argc, VALUE *argv, VALUE self)
         rsearcher = argv[i];
         switch (TYPE(rsearcher)) {
             case T_ARRAY:
-                capa += RARRAY(rsearcher)->len;
+                capa += RARRAY_LEN(rsearcher);
                 REALLOC_N(searchers, Searcher *, capa);
-                for (j = 0; j < RARRAY(rsearcher)->len; j++) {
-                    VALUE rs = RARRAY(rsearcher)->ptr[j];
+                for (j = 0; j < RARRAY_LEN(rsearcher); j++) {
+                    VALUE rs = RARRAY_PTR(rsearcher)[j];
                     Data_Get_Struct(rs, Searcher, s);
                     searchers[top++] = s;
                 }
@@ -2889,7 +3167,7 @@ frt_ms_init(int argc, VALUE *argv, VALUE self)
         }
     }
     s = msea_new(searchers, top, false);
-    Frt_Wrap_Struct(self, &frt_ms_mark, &frt_ms_free, s);
+    Frt_Wrap_Struct(self, &frb_ms_mark, &frb_ms_free, s);
     object_add(s, self);
     return self;
 }
@@ -2962,8 +3240,8 @@ Init_TopDocs(void)
                                 NULL);
     rb_set_class_path(cTopDocs, mSearch, td_class);
     rb_const_set(mSearch, rb_intern(td_class), cTopDocs);
-    rb_define_method(cTopDocs, "to_s", frt_td_to_s, -1);
-    rb_define_method(cTopDocs, "to_json", frt_td_to_json, 0);
+    rb_define_method(cTopDocs, "to_s", frb_td_to_s, -1);
+    rb_define_method(cTopDocs, "to_json", frb_td_to_json, 0);
     id_hits = rb_intern("hits");
     id_total_hits = rb_intern("total_hits");
     id_max_score = rb_intern("max_score");
@@ -2990,11 +3268,11 @@ static void
 Init_Explanation(void)
 {
     cExplanation = rb_define_class_under(mSearch, "Explanation", rb_cObject);
-    rb_define_alloc_func(cExplanation, frt_data_alloc);
+    rb_define_alloc_func(cExplanation, frb_data_alloc);
 
-    rb_define_method(cExplanation, "to_s", frt_expl_to_s, 0);
-    rb_define_method(cExplanation, "to_html", frt_expl_to_html, 0);
-    rb_define_method(cExplanation, "score", frt_expl_score, 0);
+    rb_define_method(cExplanation, "to_s", frb_expl_to_s, 0);
+    rb_define_method(cExplanation, "to_html", frb_expl_to_html, 0);
+    rb_define_method(cExplanation, "score", frb_expl_score, 0);
 }
 
 /*
@@ -3038,13 +3316,13 @@ Init_Query(void)
 {
     cQuery = rb_define_class_under(mSearch, "Query", rb_cObject);
 
-    rb_define_method(cQuery, "to_s", frt_q_to_s, -1);
-    rb_define_method(cQuery, "boost", frt_q_get_boost, 0);
-    rb_define_method(cQuery, "boost=", frt_q_set_boost, 1);
-    rb_define_method(cQuery, "eql?", frt_q_eql, 1);
-    rb_define_method(cQuery, "==", frt_q_eql, 1);
-    rb_define_method(cQuery, "hash", frt_q_hash, 0);
-    rb_define_method(cQuery, "terms", frt_q_get_terms, 1);
+    rb_define_method(cQuery, "to_s", frb_q_to_s, -1);
+    rb_define_method(cQuery, "boost", frb_q_get_boost, 0);
+    rb_define_method(cQuery, "boost=", frb_q_set_boost, 1);
+    rb_define_method(cQuery, "eql?", frb_q_eql, 1);
+    rb_define_method(cQuery, "==", frb_q_eql, 1);
+    rb_define_method(cQuery, "hash", frb_q_hash, 0);
+    rb_define_method(cQuery, "terms", frb_q_get_terms, 1);
 }
 
 /*
@@ -3071,9 +3349,9 @@ static void
 Init_TermQuery(void)
 {
     cTermQuery = rb_define_class_under(mSearch, "TermQuery", cQuery);
-    rb_define_alloc_func(cTermQuery, frt_data_alloc);
+    rb_define_alloc_func(cTermQuery, frb_data_alloc);
 
-    rb_define_method(cTermQuery, "initialize", frt_tq_init, 2);
+    rb_define_method(cTermQuery, "initialize", frb_tq_init, 2);
 }
 
 /*
@@ -3105,17 +3383,20 @@ Init_MultiTermQuery(void)
     sym_min_score = ID2SYM(rb_intern("min_score"));
 
     cMultiTermQuery = rb_define_class_under(mSearch, "MultiTermQuery", cQuery);
-    rb_define_alloc_func(cMultiTermQuery, frt_data_alloc);
-
+    rb_define_alloc_func(cMultiTermQuery, frb_data_alloc);
+#ifdef FRT_RUBY_VERSION_1_9
+    rb_cvar_set(cMultiTermQuery, id_default_max_terms, INT2FIX(512));
+#else
     rb_cvar_set(cMultiTermQuery, id_default_max_terms, INT2FIX(512), Qfalse);
+#endif
     rb_define_singleton_method(cMultiTermQuery, "default_max_terms",
-                               frt_mtq_get_dmt, 0);
+                               frb_mtq_get_dmt, 0);
     rb_define_singleton_method(cMultiTermQuery, "default_max_terms=",
-                               frt_mtq_set_dmt, 1);
+                               frb_mtq_set_dmt, 1);
 
-    rb_define_method(cMultiTermQuery, "initialize", frt_mtq_init, -1);
-    rb_define_method(cMultiTermQuery, "add_term", frt_mtq_add_term, -1);
-    rb_define_method(cMultiTermQuery, "<<", frt_mtq_add_term, -1);
+    rb_define_method(cMultiTermQuery, "initialize", frb_mtq_init, -1);
+    rb_define_method(cMultiTermQuery, "add_term", frb_mtq_add_term, -1);
+    rb_define_method(cMultiTermQuery, "<<", frb_mtq_add_term, -1);
 }
 
 static void Init_BooleanClause(void);
@@ -3149,11 +3430,11 @@ static void
 Init_BooleanQuery(void)
 {
     cBooleanQuery = rb_define_class_under(mSearch, "BooleanQuery", cQuery);
-    rb_define_alloc_func(cBooleanQuery, frt_data_alloc);
+    rb_define_alloc_func(cBooleanQuery, frb_data_alloc);
 
-    rb_define_method(cBooleanQuery, "initialize", frt_bq_init, -1);
-    rb_define_method(cBooleanQuery, "add_query", frt_bq_add_query, -1);
-    rb_define_method(cBooleanQuery, "<<", frt_bq_add_query, -1);
+    rb_define_method(cBooleanQuery, "initialize", frb_bq_init, -1);
+    rb_define_method(cBooleanQuery, "add_query", frb_bq_add_query, -1);
+    rb_define_method(cBooleanQuery, "<<", frb_bq_add_query, -1);
 
     Init_BooleanClause();
 }
@@ -3186,15 +3467,15 @@ Init_BooleanClause(void)
 
     cBooleanClause = rb_define_class_under(cBooleanQuery, "BooleanClause",
                                            rb_cObject);
-    rb_define_alloc_func(cBooleanClause, frt_data_alloc);
+    rb_define_alloc_func(cBooleanClause, frb_data_alloc);
 
-    rb_define_method(cBooleanClause, "initialize", frt_bc_init, -1);
-    rb_define_method(cBooleanClause, "query", frt_bc_get_query, 0);
-    rb_define_method(cBooleanClause, "query=", frt_bc_set_query, 1);
-    rb_define_method(cBooleanClause, "required?", frt_bc_is_required, 0);
-    rb_define_method(cBooleanClause, "prohibited?", frt_bc_is_prohibited, 0);
-    rb_define_method(cBooleanClause, "occur=", frt_bc_set_occur, 1);
-    rb_define_method(cBooleanClause, "to_s", frt_bc_to_s, 0);
+    rb_define_method(cBooleanClause, "initialize", frb_bc_init, -1);
+    rb_define_method(cBooleanClause, "query", frb_bc_get_query, 0);
+    rb_define_method(cBooleanClause, "query=", frb_bc_set_query, 1);
+    rb_define_method(cBooleanClause, "required?", frb_bc_is_required, 0);
+    rb_define_method(cBooleanClause, "prohibited?", frb_bc_is_prohibited, 0);
+    rb_define_method(cBooleanClause, "occur=", frb_bc_set_occur, 1);
+    rb_define_method(cBooleanClause, "to_s", frb_bc_to_s, 0);
 }
 
 /*
@@ -3212,6 +3493,26 @@ Init_BooleanClause(void)
  *  2006 inclusive you would write the query like this;
  *
  *    query = RangeQuery.new(:create_date, :>= "20060101", :<= "20060126")
+ *
+ *  == Range queries on numbers
+ *
+ *  There is now a new query called TypedRangeQuery which detects the type of
+ *  the range and if the range is numerical it will find a numerical range.
+ *  This allows you to do range queries with negative numbers and without
+ *  having to pad the field. However, RangeQuery will perform a lot faster on
+ *  large indexes so if you are working with a very large index you will need
+ *  to normalize your number fields so that they are a fixed width and always
+ *  positive. That way the standard String range query will do fine.
+ *
+ *  For example, if you have the numbers;
+ *
+ *    [10, -999, -90, 100, 534]
+ *
+ *  Then the can be normalized to;
+ *
+ *    # note that we have added 1000 to all numbers to make them all positive
+ *    [1010, 0001, 0910, 1100, 1534]
+ *
  */
 static void
 Init_RangeQuery(void)
@@ -3229,9 +3530,44 @@ Init_RangeQuery(void)
     sym_greater_than_or_equal_to = ID2SYM(rb_intern(">="));
 
     cRangeQuery = rb_define_class_under(mSearch, "RangeQuery", cQuery);
-    rb_define_alloc_func(cRangeQuery, frt_data_alloc);
+    rb_define_alloc_func(cRangeQuery, frb_data_alloc);
+
+    rb_define_method(cRangeQuery, "initialize", frb_rq_init, 2);
+}
+
+/*
+ *  Document-class: Ferret::Search::TypedRangeQuery
+ *
+ *  == Summary
+ *
+ *  TypedRangeQuery is used to find documents with terms in a range.
+ *  RangeQuerys are usually used on untokenized fields like date fields or
+ *  number fields. TypedRangeQuery is particularly useful for fields with
+ *  unnormalized numbers, both positive and negative, integer and float.
+ *
+ *  == Example
+ *
+ *  To find all documents written between January 1st 2006 and January 26th
+ *  2006 inclusive you would write the query like this;
+ *
+ *    query = RangeQuery.new(:create_date, :>= "-1.0", :<= "10.0")
+ *
+ *  == Performance Note
+ *
+ *  TypedRangeQuery works by converting all the terms in a field to numbers
+ *  and then comparing those numbers with the range bondaries. This can have
+ *  quite an impact on performance on large indexes so in those cases it is
+ *  usually better to use a standard RangeQuery. This will require a little
+ *  work on your behalf. See RangeQuery for notes on how to do this.
+ */
+static void
+Init_TypedRangeQuery(void)
+{
+    cTypedRangeQuery =
+        rb_define_class_under(mSearch, "TypedRangeQuery", cQuery);
+    rb_define_alloc_func(cTypedRangeQuery, frb_data_alloc);
 
-    rb_define_method(cRangeQuery, "initialize", frt_rq_init, 2);
+    rb_define_method(cTypedRangeQuery, "initialize", frb_trq_init, 2);
 }
 
 /*
@@ -3301,13 +3637,13 @@ static void
 Init_PhraseQuery(void)
 {
     cPhraseQuery = rb_define_class_under(mSearch, "PhraseQuery", cQuery);
-    rb_define_alloc_func(cPhraseQuery, frt_data_alloc);
+    rb_define_alloc_func(cPhraseQuery, frb_data_alloc);
 
-    rb_define_method(cPhraseQuery, "initialize", frt_phq_init, -1);
-    rb_define_method(cPhraseQuery, "add_term", frt_phq_add, -1);
-    rb_define_method(cPhraseQuery, "<<", frt_phq_add, -1);
-    rb_define_method(cPhraseQuery, "slop", frt_phq_get_slop, 0);
-    rb_define_method(cPhraseQuery, "slop=", frt_phq_set_slop, 1);
+    rb_define_method(cPhraseQuery, "initialize", frb_phq_init, -1);
+    rb_define_method(cPhraseQuery, "add_term", frb_phq_add, -1);
+    rb_define_method(cPhraseQuery, "<<", frb_phq_add, -1);
+    rb_define_method(cPhraseQuery, "slop", frb_phq_get_slop, 0);
+    rb_define_method(cPhraseQuery, "slop=", frb_phq_set_slop, 1);
 }
 
 /*
@@ -3343,9 +3679,9 @@ static void
 Init_PrefixQuery(void)
 {
     cPrefixQuery = rb_define_class_under(mSearch, "PrefixQuery", cQuery);
-    rb_define_alloc_func(cPrefixQuery, frt_data_alloc);
+    rb_define_alloc_func(cPrefixQuery, frb_data_alloc);
 
-    rb_define_method(cPrefixQuery, "initialize", frt_prq_init, -1);
+    rb_define_method(cPrefixQuery, "initialize", frb_prq_init, -1);
 }
 
 /*
@@ -3378,9 +3714,9 @@ static void
 Init_WildcardQuery(void)
 {
     cWildcardQuery = rb_define_class_under(mSearch, "WildcardQuery", cQuery);
-    rb_define_alloc_func(cWildcardQuery, frt_data_alloc);
+    rb_define_alloc_func(cWildcardQuery, frb_data_alloc);
 
-    rb_define_method(cWildcardQuery, "initialize", frt_wcq_init, -1);
+    rb_define_method(cWildcardQuery, "initialize", frb_wcq_init, -1);
 }
 
 /* 
@@ -3414,24 +3750,31 @@ Init_FuzzyQuery(void)
     sym_prefix_length = ID2SYM(rb_intern("prefix_length"));
 
     cFuzzyQuery = rb_define_class_under(mSearch, "FuzzyQuery", cQuery);
-    rb_define_alloc_func(cFuzzyQuery, frt_data_alloc);
+    rb_define_alloc_func(cFuzzyQuery, frb_data_alloc);
+#ifdef FRT_RUBY_VERSION_1_9
+    rb_cvar_set(cFuzzyQuery, id_default_min_similarity,
+                rb_float_new(0.5));
+    rb_cvar_set(cFuzzyQuery, id_default_prefix_length,
+                INT2FIX(0));
+#else
     rb_cvar_set(cFuzzyQuery, id_default_min_similarity,
                 rb_float_new(0.5), Qfalse);
     rb_cvar_set(cFuzzyQuery, id_default_prefix_length,
                 INT2FIX(0), Qfalse);
+#endif
 
     rb_define_singleton_method(cFuzzyQuery, "default_min_similarity",
-                               frt_fq_get_dms, 0);
+                               frb_fq_get_dms, 0);
     rb_define_singleton_method(cFuzzyQuery, "default_min_similarity=",
-                               frt_fq_set_dms, 1);
+                               frb_fq_set_dms, 1);
     rb_define_singleton_method(cFuzzyQuery, "default_prefix_length",
-                               frt_fq_get_dpl, 0);
+                               frb_fq_get_dpl, 0);
     rb_define_singleton_method(cFuzzyQuery, "default_prefix_length=",
-                               frt_fq_set_dpl, 1);
+                               frb_fq_set_dpl, 1);
 
-    rb_define_method(cFuzzyQuery, "initialize",     frt_fq_init, -1);
-    rb_define_method(cFuzzyQuery, "prefix_length",  frt_fq_pre_len, 0);
-    rb_define_method(cFuzzyQuery, "min_similarity", frt_fq_min_sim, 0);
+    rb_define_method(cFuzzyQuery, "initialize",     frb_fq_init, -1);
+    rb_define_method(cFuzzyQuery, "prefix_length",  frb_fq_pre_len, 0);
+    rb_define_method(cFuzzyQuery, "min_similarity", frb_fq_min_sim, 0);
 }
 
 /*
@@ -3447,9 +3790,9 @@ static void
 Init_MatchAllQuery(void)
 {
     cMatchAllQuery = rb_define_class_under(mSearch, "MatchAllQuery", cQuery);
-    rb_define_alloc_func(cMatchAllQuery, frt_maq_alloc);
+    rb_define_alloc_func(cMatchAllQuery, frb_maq_alloc);
 
-    rb_define_method(cMatchAllQuery, "initialize", frt_maq_init, 0);
+    rb_define_method(cMatchAllQuery, "initialize", frb_maq_init, 0);
 }
 
 /*
@@ -3477,9 +3820,9 @@ Init_ConstantScoreQuery(void)
 {
     cConstantScoreQuery = rb_define_class_under(mSearch,
                                                 "ConstantScoreQuery", cQuery);
-    rb_define_alloc_func(cConstantScoreQuery, frt_data_alloc);
+    rb_define_alloc_func(cConstantScoreQuery, frb_data_alloc);
 
-    rb_define_method(cConstantScoreQuery, "initialize", frt_csq_init, 1);
+    rb_define_method(cConstantScoreQuery, "initialize", frb_csq_init, 1);
 }
 
 /*
@@ -3497,9 +3840,9 @@ static void
 Init_FilteredQuery(void)
 {
     cFilteredQuery = rb_define_class_under(mSearch, "FilteredQuery", cQuery);
-    rb_define_alloc_func(cFilteredQuery, frt_data_alloc);
+    rb_define_alloc_func(cFilteredQuery, frb_data_alloc);
 
-    rb_define_method(cFilteredQuery, "initialize", frt_fqq_init, 2);
+    rb_define_method(cFilteredQuery, "initialize", frb_fqq_init, 2);
 }
 
 /*
@@ -3515,9 +3858,9 @@ static void
 Init_SpanTermQuery(void)
 {
     cSpanTermQuery = rb_define_class_under(mSpans, "SpanTermQuery", cQuery);
-    rb_define_alloc_func(cSpanTermQuery, frt_data_alloc);
+    rb_define_alloc_func(cSpanTermQuery, frb_data_alloc);
 
-    rb_define_method(cSpanTermQuery, "initialize", frt_spantq_init, 2);
+    rb_define_method(cSpanTermQuery, "initialize", frb_spantq_init, 2);
 }
 
 /*
@@ -3533,9 +3876,9 @@ static void
 Init_SpanMultiTermQuery(void)
 {
     cSpanMultiTermQuery = rb_define_class_under(mSpans, "SpanMultiTermQuery", cQuery);
-    rb_define_alloc_func(cSpanMultiTermQuery, frt_data_alloc);
+    rb_define_alloc_func(cSpanMultiTermQuery, frb_data_alloc);
 
-    rb_define_method(cSpanMultiTermQuery, "initialize", frt_spanmtq_init, 2);
+    rb_define_method(cSpanMultiTermQuery, "initialize", frb_spanmtq_init, 2);
 }
 
 /*
@@ -3551,9 +3894,9 @@ static void
 Init_SpanPrefixQuery(void)
 {
     cSpanPrefixQuery = rb_define_class_under(mSpans, "SpanPrefixQuery", cQuery);
-    rb_define_alloc_func(cSpanPrefixQuery, frt_data_alloc);
+    rb_define_alloc_func(cSpanPrefixQuery, frb_data_alloc);
 
-    rb_define_method(cSpanPrefixQuery, "initialize", frt_spanprq_init, -1);
+    rb_define_method(cSpanPrefixQuery, "initialize", frb_spanprq_init, -1);
 }
 
 /*
@@ -3580,9 +3923,9 @@ static void
 Init_SpanFirstQuery(void)
 {
     cSpanFirstQuery = rb_define_class_under(mSpans, "SpanFirstQuery", cQuery);
-    rb_define_alloc_func(cSpanFirstQuery, frt_data_alloc);
+    rb_define_alloc_func(cSpanFirstQuery, frb_data_alloc);
 
-    rb_define_method(cSpanFirstQuery, "initialize", frt_spanfq_init, 2);
+    rb_define_method(cSpanFirstQuery, "initialize", frb_spanfq_init, 2);
 }
 
 /*
@@ -3631,11 +3974,11 @@ Init_SpanNearQuery(void)
     sym_clauses = ID2SYM(rb_intern("clauses"));
 
     cSpanNearQuery = rb_define_class_under(mSpans, "SpanNearQuery", cQuery);
-    rb_define_alloc_func(cSpanNearQuery, frt_data_alloc);
+    rb_define_alloc_func(cSpanNearQuery, frb_data_alloc);
 
-    rb_define_method(cSpanNearQuery, "initialize", frt_spannq_init, -1);
-    rb_define_method(cSpanNearQuery, "add", frt_spannq_add, 1);
-    rb_define_method(cSpanNearQuery, "<<", frt_spannq_add, 1);
+    rb_define_method(cSpanNearQuery, "initialize", frb_spannq_init, -1);
+    rb_define_method(cSpanNearQuery, "add", frb_spannq_add, 1);
+    rb_define_method(cSpanNearQuery, "<<", frb_spannq_add, 1);
 }
 
 /*
@@ -3681,11 +4024,11 @@ static void
 Init_SpanOrQuery(void)
 {
     cSpanOrQuery = rb_define_class_under(mSpans, "SpanOrQuery", cQuery);
-    rb_define_alloc_func(cSpanOrQuery, frt_data_alloc);
+    rb_define_alloc_func(cSpanOrQuery, frb_data_alloc);
 
-    rb_define_method(cSpanOrQuery, "initialize", frt_spanoq_init, -1);
-    rb_define_method(cSpanOrQuery, "add", frt_spanoq_add, 1);
-    rb_define_method(cSpanOrQuery, "<<", frt_spanoq_add, 1);
+    rb_define_method(cSpanOrQuery, "initialize", frb_spanoq_init, -1);
+    rb_define_method(cSpanOrQuery, "add", frb_spanoq_add, 1);
+    rb_define_method(cSpanOrQuery, "<<", frb_spanoq_add, 1);
 }
 
 /*
@@ -3715,9 +4058,9 @@ static void
 Init_SpanNotQuery(void)
 {
     cSpanNotQuery = rb_define_class_under(mSpans, "SpanNotQuery", cQuery);
-    rb_define_alloc_func(cSpanNotQuery, frt_data_alloc);
+    rb_define_alloc_func(cSpanNotQuery, frb_data_alloc);
 
-    rb_define_method(cSpanNotQuery, "initialize", frt_spanxq_init, 2);
+    rb_define_method(cSpanNotQuery, "initialize", frb_spanxq_init, 2);
 }
 
 /* rdoc hack
@@ -3762,15 +4105,48 @@ Init_Spans(void)
  *  Find all documents created before 5th of September 2002.
  *
  *    filter = RangeFilter.new(:created_on, :< => "20020905")
+ *
+ *  == Number fields
+ *
+ *  See RangeQuery for notes on how to use the RangeFilter on a field
+ *  containing numbers.
  */
 static void
 Init_RangeFilter(void)
 {
     cRangeFilter = rb_define_class_under(mSearch, "RangeFilter", cFilter);
-    frt_mark_cclass(cRangeFilter);
-    rb_define_alloc_func(cRangeFilter, frt_data_alloc);
+    frb_mark_cclass(cRangeFilter);
+    rb_define_alloc_func(cRangeFilter, frb_data_alloc);
+
+    rb_define_method(cRangeFilter, "initialize", frb_rf_init, 2);
+}
+
+/*
+ *  Document-class: Ferret::Search::TypedRangeFilter
+ *
+ *  == Summary
+ *
+ *  TypedRangeFilter filters a set of documents which contain a
+ *  lexicographical range of terms (ie "aaa", "aab", "aac", etc), unless the
+ *  range boundaries happen to be numbers (positive, negative, integer,
+ *  float), in which case a numerical filter is applied. See also
+ *  TypedRangeQuery
+ *
+ *  == Example
+ *
+ *  Find all products that cost less than  or equal to $50.00.
+ *
+ *    filter = TypedRangeFilter.new(:created_on, :<= => "50.00")
+ */
+static void
+Init_TypedRangeFilter(void)
+{
+    cTypedRangeFilter =
+        rb_define_class_under(mSearch, "TypedRangeFilter", cFilter);
+    frb_mark_cclass(cTypedRangeFilter);
+    rb_define_alloc_func(cTypedRangeFilter, frb_data_alloc);
 
-    rb_define_method(cRangeFilter, "initialize", frt_rf_init, 2);
+    rb_define_method(cTypedRangeFilter, "initialize", frb_trf_init, 2);
 }
 
 /*
@@ -3802,10 +4178,10 @@ static void
 Init_QueryFilter(void)
 {
     cQueryFilter = rb_define_class_under(mSearch, "QueryFilter", cFilter);
-    frt_mark_cclass(cQueryFilter);
-    rb_define_alloc_func(cQueryFilter, frt_data_alloc);
+    frb_mark_cclass(cQueryFilter);
+    rb_define_alloc_func(cQueryFilter, frb_data_alloc);
 
-    rb_define_method(cQueryFilter, "initialize", frt_qf_init, 1);
+    rb_define_method(cQueryFilter, "initialize", frb_qf_init, 1);
 }
 
 /*
@@ -3828,11 +4204,11 @@ Init_Filter(void)
 {
     id_bits = rb_intern("bits");
     cFilter = rb_define_class_under(mSearch, "Filter", rb_cObject);
-    frt_mark_cclass(cFilter);
-    rb_define_alloc_func(cConstantScoreQuery, frt_data_alloc);
+    frb_mark_cclass(cFilter);
+    rb_define_alloc_func(cConstantScoreQuery, frb_data_alloc);
 
-    rb_define_method(cFilter, "bits", frt_f_get_bits, 1);
-    rb_define_method(cFilter, "to_s", frt_f_to_s, 0);
+    rb_define_method(cFilter, "bits", frb_f_get_bits, 1);
+    rb_define_method(cFilter, "to_s", frb_f_to_s, 0);
 }
 
 /*
@@ -3890,32 +4266,32 @@ Init_SortField(void)
     sym_byte = ID2SYM(rb_intern("byte"));
 
     cSortField = rb_define_class_under(mSearch, "SortField", rb_cObject);
-    rb_define_alloc_func(cSortField, frt_data_alloc);
+    rb_define_alloc_func(cSortField, frb_data_alloc);
 
-    rb_define_method(cSortField, "initialize", frt_sf_init, -1);
-    rb_define_method(cSortField, "reverse?", frt_sf_is_reverse, 0);
-    rb_define_method(cSortField, "name", frt_sf_get_name, 0);
-    rb_define_method(cSortField, "type", frt_sf_get_type, 0);
-    rb_define_method(cSortField, "comparator", frt_sf_get_comparator, 0);
-    rb_define_method(cSortField, "to_s", frt_sf_to_s, 0);
+    rb_define_method(cSortField, "initialize", frb_sf_init, -1);
+    rb_define_method(cSortField, "reverse?", frb_sf_is_reverse, 0);
+    rb_define_method(cSortField, "name", frb_sf_get_name, 0);
+    rb_define_method(cSortField, "type", frb_sf_get_type, 0);
+    rb_define_method(cSortField, "comparator", frb_sf_get_comparator, 0);
+    rb_define_method(cSortField, "to_s", frb_sf_to_s, 0);
 
     rb_define_const(cSortField, "SCORE",
                     Data_Wrap_Struct(cSortField, NULL,
-                                     &frt_deref_free,
+                                     &frb_deref_free,
                                      (SortField *)&SORT_FIELD_SCORE));
     object_add((SortField *)&SORT_FIELD_SCORE,
                rb_const_get(cSortField, rb_intern("SCORE")));
 
     rb_define_const(cSortField, "SCORE_REV",
                     Data_Wrap_Struct(cSortField, NULL,
-                                     &frt_deref_free,
+                                     &frb_deref_free,
                                      (SortField *)&SORT_FIELD_SCORE_REV));
     object_add((SortField *)&SORT_FIELD_SCORE_REV,
                rb_const_get(cSortField, rb_intern("SCORE_REV")));
 
     rb_define_const(cSortField, "DOC_ID",
                     Data_Wrap_Struct(cSortField, NULL,
-                                     &frt_deref_free, 
+                                     &frb_deref_free, 
                                      (SortField *)&SORT_FIELD_DOC));
 
     oSORT_FIELD_DOC = rb_const_get(cSortField, rb_intern("DOC_ID"));
@@ -3923,7 +4299,7 @@ Init_SortField(void)
 
     rb_define_const(cSortField, "DOC_ID_REV",
                     Data_Wrap_Struct(cSortField, NULL,
-                                     &frt_deref_free, 
+                                     &frb_deref_free, 
                                      (SortField *)&SORT_FIELD_DOC_REV));
     object_add((SortField *)&SORT_FIELD_DOC_REV,
                rb_const_get(cSortField, rb_intern("DOC_ID_REV")));
@@ -3954,16 +4330,16 @@ Init_Sort(void)
 {
     /* Sort */
     cSort = rb_define_class_under(mSearch, "Sort", rb_cObject);
-    rb_define_alloc_func(cSort, frt_sort_alloc);
+    rb_define_alloc_func(cSort, frb_sort_alloc);
 
-    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_method(cSort, "initialize", frb_sort_init, -1);
+    rb_define_method(cSort, "fields", frb_sort_get_fields, 0);
+    rb_define_method(cSort, "to_s", frb_sort_to_s, 0);
 
     rb_define_const(cSort, "RELEVANCE",
-                    frt_sort_init(0, NULL, frt_sort_alloc(cSort)));
+                    frb_sort_init(0, NULL, frb_sort_alloc(cSort)));
     rb_define_const(cSort, "INDEX_ORDER",
-                    frt_sort_init(1, &oSORT_FIELD_DOC, frt_sort_alloc(cSort)));
+                    frb_sort_init(1, &oSORT_FIELD_DOC, frb_sort_alloc(cSort)));
 }
 
 /*
@@ -4000,12 +4376,14 @@ static void
 Init_Searcher(void)
 {
     /* option hash keys for Searcher#search */
-    sym_offset      = ID2SYM(rb_intern("offset"));
-    sym_limit       = ID2SYM(rb_intern("limit"));
-    sym_all         = ID2SYM(rb_intern("all"));
-    sym_filter      = ID2SYM(rb_intern("filter"));
-    sym_filter_proc = ID2SYM(rb_intern("filter_proc"));
-    sym_sort        = ID2SYM(rb_intern("sort"));
+    sym_offset          = ID2SYM(rb_intern("offset"));
+    sym_limit           = ID2SYM(rb_intern("limit"));
+    sym_start_doc       = ID2SYM(rb_intern("start_doc"));
+    sym_all             = ID2SYM(rb_intern("all"));
+    sym_filter          = ID2SYM(rb_intern("filter"));
+    sym_filter_proc     = ID2SYM(rb_intern("filter_proc"));
+    sym_c_filter_proc   = ID2SYM(rb_intern("c_filter_proc"));
+    sym_sort            = ID2SYM(rb_intern("sort"));
 
     sym_excerpt_length  = ID2SYM(rb_intern("excerpt_length"));
     sym_num_excerpts    = ID2SYM(rb_intern("num_excerpts"));  
@@ -4015,19 +4393,20 @@ Init_Searcher(void)
 
     /* Searcher */
     cSearcher = rb_define_class_under(mSearch, "Searcher", rb_cObject);
-    rb_define_alloc_func(cSearcher, frt_data_alloc);
-
-    rb_define_method(cSearcher, "initialize", frt_sea_init, 1);
-    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, 2);
-    rb_define_method(cSearcher, "get_document", 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, -1);
-    rb_define_method(cSearcher, "explain", frt_sea_explain, 2);
-    rb_define_method(cSearcher, "highlight", frt_sea_highlight, -1);
+    rb_define_alloc_func(cSearcher, frb_data_alloc);
+
+    rb_define_method(cSearcher, "initialize", frb_sea_init, 1);
+    rb_define_method(cSearcher, "close", frb_sea_close, 0);
+    rb_define_method(cSearcher, "reader", frb_sea_get_reader, 0);
+    rb_define_method(cSearcher, "doc_freq", frb_sea_doc_freq, 2);
+    rb_define_method(cSearcher, "get_document", frb_sea_doc, 1);
+    rb_define_method(cSearcher, "[]", frb_sea_doc, 1);
+    rb_define_method(cSearcher, "max_doc", frb_sea_max_doc, 0);
+    rb_define_method(cSearcher, "search", frb_sea_search, -1);
+    rb_define_method(cSearcher, "search_each", frb_sea_search_each, -1);
+    rb_define_method(cSearcher, "scan", frb_sea_scan, -1);
+    rb_define_method(cSearcher, "explain", frb_sea_explain, 2);
+    rb_define_method(cSearcher, "highlight", frb_sea_highlight, -1);
 }
 
 /*
@@ -4046,8 +4425,8 @@ static void
 Init_MultiSearcher(void)
 {
     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);
+    rb_define_alloc_func(cMultiSearcher, frb_data_alloc);
+    rb_define_method(cMultiSearcher, "initialize", frb_ms_init, -1);
 }
 
 /*
@@ -4071,6 +4450,8 @@ Init_Search(void)
 {
     mSearch = rb_define_module_under(mFerret, "Search");
 
+    fsym_id = I("id");
+
     Init_Hit();
     Init_TopDocs();
     Init_Explanation();
@@ -4082,6 +4463,7 @@ Init_Search(void)
     Init_MultiTermQuery();
     Init_BooleanQuery();
     Init_RangeQuery();
+    Init_TypedRangeQuery();
     Init_PhraseQuery();
     Init_PrefixQuery();
     Init_WildcardQuery();
@@ -4095,6 +4477,7 @@ Init_Search(void)
     /* Filters */
     Init_Filter();
     Init_RangeFilter();
+    Init_TypedRangeFilter();
     Init_QueryFilter();
 
     /* Sorting */