jk-ferret 0.11.8.2 → 0.11.8.3

data/Rakefile

@@ -142,7 +142,7 @@ namespace :build do
 
   file "ext/Makefile" => SRC do
     cd "ext"
-    `ruby extconf.rb`
+    ruby "extconf.rb"
     cd ".."
   end
 end

data/ext/except.h

@@ -3,6 +3,11 @@
  *
  * Exception Handling looks something like this;
  *
+ * ### NOTE ###
+ * You must use a FINALLY block if you use "default:" block. Otherwise the
+ * default: block will get called in place of the FINALLY block.
+ *
+ *
  * <pre>
  *   FRT_TRY
  *       FRT_RAISE(FRT_EXCEPTION, msg1);
@@ -143,7 +148,7 @@ typedef struct frt_xcontext_t
 # define FRT_RAISE(excode, ...) do {\
   snprintf(frt_xmsg_buffer, FRT_XMSG_BUFFER_SIZE, __VA_ARGS__);\
   snprintf(frt_xmsg_buffer_final, FRT_XMSG_BUFFER_SIZE,\
-          "Error occured in %s:%d - %s\n\t%s\n",\
+          "Error occured in %s:%d - %s\n\t%s",\
           __FILE__, __LINE__, __func__, frt_xmsg_buffer);\
   frt_xraise(excode, frt_xmsg_buffer_final);\
 } while (0)

data/ext/ferret.c

@@ -86,7 +86,7 @@ void
 //object_del(void *key)
 object_del2(void *key, const char *file, int line)
 {
-    if (object_get(key) == Qnil) 
+    if (object_get(key) == Qnil)
         printf("failed deleting %ld. %s:%d\n", (long)key, file, line);
     //printf("deleting %ld. now contains %ld, %s:%d\n", (long)key, --hash_cnt, file, line);
     h_del(object_map, key);
@@ -140,7 +140,6 @@ void *frb_thread_getspecific(thread_key_t key)
 void frb_create_dir(VALUE rpath)
 {
     VALUE mFileUtils;
-    rb_require("fileutils");
     mFileUtils = rb_define_module("FileUtils");
     rb_funcall(mFileUtils, id_mkdir_p, 1, rpath);
 }
@@ -261,7 +260,7 @@ void V_FRT_EXIT(const char *err_type, const char *fmt, va_list args)
     }
 
     snprintf(buf + so_far, FRT_BUF_SIZ - so_far, "\n");
-    rb_raise(frb_get_error(err_type), buf);
+    rb_raise(frb_get_error(err_type), "%s", buf);
 }
 
 #ifdef FRT_HAS_VARARGS
@@ -300,8 +299,8 @@ VALUE frb_get_term(Symbol field, const char *text)
 static VALUE frb_term_to_s(VALUE self)
 {
     VALUE rstr;
-    VALUE rfield = rb_funcall(self, id_field, 0); 
-    VALUE rtext = rb_funcall(self, id_text, 0); 
+    VALUE rfield = rb_funcall(self, id_field, 0);
+    VALUE rtext = rb_funcall(self, id_text, 0);
     char *field = StringValuePtr(rfield);
     char *text = StringValuePtr(rtext);
     char *term_str = ALLOC_N(char,
@@ -338,6 +337,7 @@ void Init_Ferret(void)
 {
     mFerret = rb_define_module("Ferret");
     Init_Term();
+    rb_require("fileutils");
 }
 
 void Init_ferret_ext(void)

data/ext/fs_store.c

@@ -153,6 +153,20 @@ static void fs_clear_locks(Store *store)
     closedir(d);
 }
 
+static void remove_if_index_file(const char *base_path, const char *file_name)
+{
+    char path[MAX_FILE_PATH];
+    char *basename;
+    join_path(path, base_path, file_name);
+    /* get basename of path */
+    basename = strrchr(path, DIR_SEPARATOR_CHAR);
+    basename = (basename ? basename + 1 : path);
+    /* we don't want to delete non-index files here */
+    if (file_name_filter_is_index_file(basename, true)) {
+        remove(path);
+    }
+}
+
 static void fs_clear(Store *store)
 {
     struct dirent *de;
@@ -166,13 +180,16 @@ static void fs_clear(Store *store)
     while ((de = readdir(d)) != NULL) {
         if (de->d_name[0] > '/' /* skip ., .., / and '\0'*/
                 && !file_is_lock(de->d_name)) {
-            char path[MAX_FILE_PATH];
-            remove(join_path(path, store->dir.path, de->d_name));
+            remove_if_index_file(store->dir.path, de->d_name);
         }
     }
     closedir(d);
 }
 
+/**
+ * Clear all files which belong to the index. Use fs_clear to clear the
+ * directory regardless of the files origin.
+ */
 static void fs_clear_all(Store *store)
 {
     struct dirent *de;
@@ -185,16 +202,7 @@ static void fs_clear_all(Store *store)
 
     while ((de = readdir(d)) != NULL) {
         if (de->d_name[0] > '/') { /* skip ., .., / and '\0'*/
-            char path[MAX_FILE_PATH];
-            char *basename;
-            join_path(path, store->dir.path, de->d_name);
-            /* get basename of path */
-            basename = strrchr(path, DIR_SEPARATOR_CHAR);
-            basename = (basename ? basename + 1 : path);
-            /* we don't want to delete no index files here */
-            if (file_name_filter_is_index_file(basename, true)) {
-                remove(path);
-            }
+            remove_if_index_file(store->dir.path, de->d_name);
         }
     }
     closedir(d);

data/ext/global.c

@@ -147,16 +147,14 @@ char *dbl_to_s(char *buf, double num)
     }
 #endif
 
-    sprintf(buf, "%#.7g", num);
+    sprintf(buf, DBL2S, num);
     if (!(e = strchr(buf, 'e'))) {
         e = buf + strlen(buf);
     }
     if (!isdigit(e[-1])) {
         /* reformat if ended with decimal point (ex 111111111111111.) */
         sprintf(buf, "%#.6e", num);
-        if (!(e = strchr(buf, 'e'))) {
-            e = buf + strlen(buf);
-        }
+        if (!(e = strchr(buf, 'e'))) { e = buf + strlen(buf); }
     }
     p = e;
     while (p[-1] == '0' && isdigit(p[-2])) {
@@ -275,8 +273,7 @@ static char *build_gdb_commandfile()
     const char *commands = "bt\nquit\n";
     char *filename = ALLOC_N(char, FILENAME_MAX);
     int fd = build_tempfile(filename, FILENAME_MAX);
-    if (fd < 0)
-        return NULL;
+    if (fd < 0) { return NULL; }
     write(fd, commands, strlen(commands));
     close(fd);
     return filename;
@@ -456,3 +453,46 @@ void init(int argc, const char *const argv[])
 
     atexit(&hash_finalize);
 }
+
+/**
+ * For general use when testing
+ *
+ * TODO wrap in #ifdef
+ */
+
+static bool p_switch = false;
+static bool p_switch_tmp = false;
+
+void p(const char *format, ...)
+{
+    va_list args;
+
+    if (!p_switch) return;
+
+    va_start(args, format);
+    vfprintf(stderr, format, args);
+    va_end(args);
+}
+
+void p_on()
+{
+    fprintf(stderr, "> > > > > STARTING PRINT\n");
+    p_switch = true;
+}
+
+void p_off()
+{
+    fprintf(stderr, "< < < < < STOPPING PRINT\n");
+    p_switch = false;
+}
+
+void p_pause()
+{
+    p_switch_tmp = p_switch;
+    p_switch = false;
+}
+
+void p_resume()
+{
+    p_switch = p_switch_tmp;
+}

data/ext/global.h

@@ -18,6 +18,8 @@ extern "C" {
 #define FRT_MAX_FILE_PATH 1024
 #define FRT_BUFFER_SIZE 1024
 
+#define FRT_DBL2S "%#.7g"
+
 #if defined(__GNUC__) && !defined(__cplusplus)
 #  define FRT_INLINE
 #else
@@ -299,4 +301,15 @@ extern void frt_clean_up();
 } // extern "C"
 #endif
 
+
+/**
+ * For general use during testing. Switch this on and off for print statements
+ * to only print when p_on is called and not after p_off is called
+ */
+extern void p(const char *format, ...);
+extern void p_on();
+extern void p_off();
+extern void p_pause();
+extern void p_resume();
+
 #endif

data/ext/index.c

@@ -401,7 +401,7 @@ FieldInfo *fis_by_number(FieldInfos *fis, int num)
 
 FieldInfos *fis_read(InStream *is)
 {
-    FieldInfos *volatile fis;
+    FieldInfos *volatile fis = NULL;
     TRY
         do {
             StoreValue store_val;

data/ext/internal.h

@@ -24,6 +24,7 @@
 #define COMMIT_LOCK_NAME                   FRT_COMMIT_LOCK_NAME
 #define CONSTANT_QUERY                     FRT_CONSTANT_QUERY
 #define CW_INIT_CAPA                       FRT_CW_INIT_CAPA
+#define DBL2S                              FRT_DBL2S
 #define DEFAULT_MAX_CLAUSE_COUNT           FRT_DEFAULT_MAX_CLAUSE_COUNT
 #define DEF_MAX_TERMS                      FRT_DEF_MAX_TERMS
 #define DEF_MIN_SIM                        FRT_DEF_MIN_SIM

data/ext/q_phrase.c

@@ -52,6 +52,8 @@ typedef struct PhPos
 static bool pp_next(PhPos *self)
 {
     TermDocEnum *tpe = self->tpe;
+    assert(tpe);
+
     if (!tpe->next(tpe)) {
         tpe->close(tpe);            /* close stream */
         self->tpe = NULL;
@@ -66,9 +68,7 @@ static bool pp_next(PhPos *self)
 static bool pp_skip_to(PhPos *self, int doc_num)
 {
     TermDocEnum *tpe = self->tpe;
-    if (!tpe) {
-        return false;
-    }
+    assert(tpe);
 
     if (!tpe->skip_to(tpe, doc_num)) {
         tpe->close(tpe);            /* close stream */
@@ -337,11 +337,10 @@ static Scorer *phsc_new(Weight *weight,
             for (j = 0; j < t_cnt; j++) {
                 if (hs_add(term_set, terms[j])) {
                     PhSc(self)->check_repeats = true;
-                    goto repeat_check_done;
+                    break;
                 }
             }
         }
-repeat_check_done:
         PhSc(self)->phrase_pos[i] = pp_new(term_pos_enum[i], positions[i].pos);
     }
 
@@ -1104,7 +1103,7 @@ static unsigned long phq_hash(Query *self)
         char **terms = phq->positions[i].terms;
         for (j = ary_size(terms) - 1; j >= 0; j--) {
             hash = (hash << 1) ^ (str_hash(terms[j])
-                                  ^ phq->positions[i].pos);
+                               ^ phq->positions[i].pos);
         }
     }
     return (hash ^ phq->slop);

data/ext/q_span.c

@@ -828,7 +828,8 @@ static bool spanoe_skip_to(SpanEnum *self, int target)
     }
     else {
         while ((soe->queue->size != 0) &&
-               ((se = (SpanEnum *)pq_top(soe->queue))->doc(se) < target)) {
+               ((se = (SpanEnum *)pq_top(soe->queue)) != NULL) &&
+               (se->doc(se) < target)) {
             if (se->skip_to(se, target)) {
                 pq_down(soe->queue);
             }

data/ext/r_index.c

@@ -1,6 +1,10 @@
 #include "ferret.h"
 #include "index.h"
-#include <st.h>
+#ifdef FRT_RUBY_VERSION_1_9
+#  include <ruby/st.h>
+#else
+#  include <st.h>
+#endif
 
 VALUE mIndex;
 
@@ -811,7 +815,7 @@ frb_te_set_field(VALUE self, VALUE rfield)
     } else {
         Check_Type(rfield, T_SYMBOL);
         rb_raise(rb_eArgError, "field %s doesn't exist in the index",
-                 frb_field(rfield));
+                 (char *)frb_field(rfield));
     }
     te->set_field(te, field_num);
 
@@ -940,7 +944,7 @@ frb_tde_seek(VALUE self, VALUE rfield, VALUE rterm)
         field_num = FIX2INT(rfnum);
     } else {
         rb_raise(rb_eArgError, "field %s doesn't exist in the index",
-                 frb_field(rfield));
+                 (char *)frb_field(rfield));
     }
     tde->seek(tde, field_num, term);
     return self;
@@ -2219,7 +2223,7 @@ frb_ir_get_norms_into(VALUE self, VALUE rfield, VALUE rnorms, VALUE roffset)
     offset = FIX2INT(roffset);
     Check_Type(rnorms, T_STRING);
     if (RSTRING_LEN(rnorms) < offset + ir->max_doc(ir)) {
-        rb_raise(rb_eArgError, "supplied a string of length:%d to "
+        rb_raise(rb_eArgError, "supplied a string of length:%ld to "
                  "IndexReader#get_norms_into but needed a string of length "
                  "offset:%d + maxdoc:%d",
                  RSTRING_LEN(rnorms), offset, ir->max_doc(ir));
@@ -2392,8 +2396,8 @@ frb_ir_get_doc(int argc, VALUE *argv, VALUE self)
             pos = FIX2INT(arg1);
             pos = (pos < 0) ? (max + pos) : pos;
             if (pos < 0 || pos >= max) {
-                rb_raise(rb_eArgError, "index %d is out of range [%d..%d] for "
-                         "IndexReader#[]", pos, 0, max, -1);
+                rb_raise(rb_eArgError, "index %ld is out of range [%d..%ld] for "
+                         "IndexReader#[]", pos, 0, max);
             }
             return frb_get_lazy_doc(ir->get_lazy_doc(ir, pos));
         }

data/ext/r_qparser.c

@@ -266,7 +266,7 @@ frb_qp_parse(VALUE self, VALUE rstr)
     XENDTRY
 
     if (msg) {
-        rb_raise(cQueryParseException, msg);
+        rb_raise(cQueryParseException, "%s", msg);
     }
 
     return rq;

data/ext/r_search.c

@@ -207,8 +207,8 @@ frb_td_to_s(int argc, VALUE *argv, VALUE self)
         field = frb_field(argv[0]);
     }
 
-    sprintf(str, "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)));
     p = (int)strlen(str);
 
@@ -2676,7 +2676,7 @@ frb_sea_search_internal(Query *query, VALUE roptions, Searcher *sea)
             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))) {
@@ -2911,7 +2911,7 @@ frb_sea_scan(int argc, VALUE *argv, VALUE self)
             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)));
             }
         }
     }

data/ext/ram_store.c

@@ -379,8 +379,9 @@ static InStream *ram_open_input(Store *store, const char *filename)
 static int ram_lock_obtain(Lock *lock)
 {
     int ret = true;
-    if (ram_exists(lock->store, lock->name))
+    if (ram_exists(lock->store, lock->name)) {
         ret = false;
+    }
     ram_touch(lock->store, lock->name);
     return ret;
 }

data/ext/store.c

@@ -11,7 +11,7 @@
 void with_lock(Lock *lock, void (*func)(void *arg), void *arg)
 {
     if (!lock->obtain(lock)) {
-        RAISE(IO_ERROR, "couldn't obtain lock \"%s\"", lock->name);
+        RAISE(LOCK_ERROR, "couldn't obtain lock \"%s\"", lock->name);
     }
     func(arg);
     lock->release(lock);

data/ext/store.h

@@ -124,7 +124,7 @@ struct FrtInStream
     } file;
     union
     {
-        off_t pointer;           /* only used by RAMIn */
+        off_t pointer;          /* only used by RAMIn */
         char *path;             /* only used by FSIn */
         FrtCompoundInStream *cis;
     } d;
@@ -163,13 +163,13 @@ typedef struct FrtCompoundStore
 struct FrtStore
 {
     int ref_cnt;                /* for fs_store only */
-    frt_mutex_t mutex_i;            /* for internal use only */
-    frt_mutex_t mutex;              /* external mutex for use outside */
+    frt_mutex_t mutex_i;        /* for internal use only */
+    frt_mutex_t mutex;          /* external mutex for use outside */
     union
     {
         char *path;             /* for fs_store only */
-        FrtHash *ht;    /* for ram_store only */
-        FrtCompoundStore *cmpd;    /* for compound_store only */
+        FrtHash *ht;            /* for ram_store only */
+        FrtCompoundStore *cmpd; /* for compound_store only */
     } dir;
 
 #ifdef POSH_OS_WIN32

data/lib/ferret/field_symbol.rb

@@ -5,7 +5,7 @@ module Ferret
   # __id__. It is useful for creating proxy classes. It is currently used by
   # the FieldSymbol class which is a proxy to the Symbol class 
   class BlankSlate
-    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
+    instance_methods.each { |m| undef_method m unless m =~ /^__|object_id/ }
   end
 
   # The FieldSymbolMethods module contains the methods that are added to both

data/lib/ferret/version.rb

@@ -1,3 +1,3 @@
 module Ferret
-  VERSION = '0.11.8.2'
+  VERSION = '0.11.8.3'
 end

data/test/unit/store/tc_fs_store.rb

@@ -15,8 +15,8 @@ class FSStoreTest < Test::Unit::TestCase
   end
 
   def teardown
-    @dir.refresh()
     @dir.close()
+    Dir[File.join(@dpath, "*")].each {|path| begin File.delete(path) rescue nil end}
   end
 
   def test_fslock

data/test/unit/store/tm_store_lock.rb

@@ -1,6 +1,5 @@
 module StoreLockTest
   class Switch
-    @@counter = 0
     def Switch.counter() return @@counter end
     def Switch.counter=(counter) @@counter = counter end
   end
@@ -14,7 +13,7 @@ module StoreLockTest
     assert(lock1.obtain(lock_time_out))
     assert(lock2.locked?)
 
-    assert(! can_obtain_lock?(lock2))
+    assert(! can_obtain_lock?(lock2, lock_time_out))
 
     exception_thrown = false
     begin
@@ -31,6 +30,8 @@ module StoreLockTest
     assert(lock2.obtain(lock_time_out))
     lock2.release()
 
+    Switch.counter = 0
+
     t = Thread.new() do
       lock1.while_locked(lock_time_out) do
         Switch.counter = 1
@@ -46,7 +47,8 @@ module StoreLockTest
     while Switch.counter < 1
     end
     
-    assert(! can_obtain_lock?(lock2), "lock 2 should not be obtainable")
+    assert(! can_obtain_lock?(lock2, lock_time_out),
+           "lock 2 should not be obtainable")
 
     Switch.counter = 2
     while Switch.counter < 3
@@ -56,8 +58,7 @@ module StoreLockTest
     lock2.release()
   end
 
-  def can_obtain_lock?(lock)
-    lock_time_out = 0.001 # we want this test to run quickly
+  def can_obtain_lock?(lock, lock_time_out)
     begin
       lock.obtain(lock_time_out)
       return true

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jk-ferret
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 11
-  - 8
-  - 2
-  version: 0.11.8.2
+  version: 0.11.8.3
 platform: ruby
 authors: 
 - David Balmain
@@ -15,22 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 +02:00
+date: 2011-02-22 00:00:00 +01:00
 default_executable: ferret-browser
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+    version: 
 description: Ferret is a super fast, highly configurable search library.
 email: dbalmain@gmail.com
 executables: 
@@ -275,8 +266,6 @@ files:
 - ext/term_vectors.c
 - ext/threading.h
 - ext/win32.h
-- bin/ferret-browser
-- ext/extconf.rb
 has_rdoc: true
 homepage: http://github.com/jkraemer/ferret
 licenses: []
@@ -293,25 +282,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: ferret
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby indexing library.