Changeset 399100f1271aa3320cae55afa2d8364875291971

Timestamp:

04/22/08 18:51:17 (9 months ago)

Author:

David Balmain <dbalmain@…>

Parents:

f84102bad115887754ae1fafed8c072360deee9b

Children:

3d5c1b18b9912541a77e63bdb908db34f068b328

git-committer:

David Balmain <dbalmain@gmail.com> / 2008-04-22T18:51:17Z+1000

Message:

Fixed to compile ruby bindings

The Ferret bindings now call Ferret's init function to initialize everything.
This is necessary so that intern will work but it also adds some other stuff
like signal trapping and stacktraces on exit.

Location:

ruby

Files:

• .gitignore (modified) (1 diff)
• ext/extconf.rb (modified) (1 diff)
• ext/ferret.c (modified) (4 diffs)
• ext/ferret.h (modified) (1 diff)
• ext/r_analysis.c (modified) (1 diff)
• ext/r_index.c (modified) (4 diffs)
• ext/r_qparser.c (modified) (5 diffs)

ruby/.gitignore

@@ -72 +72 @@
 ext/index.c
 ext/index.h
+ext/intern.c
+ext/intern.h
 ext/internal.h
 ext/libstemmer.h

ruby/ext/extconf.rb

@@ -6 +6 @@
 elsif ENV['FERRET_DEV']
   require 'mkmf'
-  $CFLAGS += " -Wall -fno-stack-protector -fno-common -D_FILE_OFFSET_BITS=64"
+  $CFLAGS += " -g -Wall -fno-stack-protector -fno-common -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=500"
   create_makefile("ferret_ext")
 else
   require 'mkmf'
-  $CFLAGS += " -Wall -D_FILE_OFFSET_BITS=64"
+  $CFLAGS += " -Wall -D_FILE_OFFSET_BITS=64 -D_XOPEN_SOURCE=500"
   create_makefile("ferret_ext")
 end

ruby/ext/ferret.c

@@ -5 +5 @@
 #include "hashset.h"
 #include "threading.h"
+#include "intern.h"
 #include "internal.h"
 
@@ -169 +170 @@
 
 char *
-nstrdup(VALUE rstr)
+rstrdup(VALUE rstr)
 {
     char *old = rs2s(rstr);
@@ -176 +177 @@
     memcpy(new, old, len + 1);
     return new;
+}
+
+const char *
+rintern(VALUE rstr)
+{
+    char *old = rs2s(rstr);
+    return frt_intern(old);
 }
 
@@ -338 +346 @@
     VALUE cStateError;
     VALUE cFileNotFoundError;
+
+    const char *const progname[] = {"ruby"};
+
+    frt_init(1, progname);
 
     /* initialize object map */

ruby/ext/ferret.h

@@ -69 +69 @@
 extern char *json_concat_string(char *s, char *field);
 extern char *rs2s(VALUE rstr);
-extern char *nstrdup(VALUE rstr);
+extern char *rstrdup(VALUE rstr);
+extern const char *rintern(VALUE rstr);
 #define Frt_Make_Struct(klass)\
   rb_data_object_alloc(klass,NULL,(RUBY_DATA_FUNC)NULL,(RUBY_DATA_FUNC)NULL)

ruby/ext/r_analysis.c

@@ -1149 +1149 @@
 
 static TokenStream *
-cwa_get_ts(Analyzer *a, char *field, char *text)
+cwa_get_ts(Analyzer *a, const char *field, char *text)
 {
     VALUE rts = rb_funcall(CWA(a)->ranalyzer, id_token_stream, 2,

ruby/ext/r_index.c

@@ -1461 +1461 @@
                     for (i = 0; i < RARRAY(value)->len; i++) {
                         val = rb_obj_as_string(RARRAY(value)->ptr[i]);
-                        df_add_data_len(df, nstrdup(val), RSTRING(val)->len);
+                        df_add_data_len(df, rstrdup(val), RSTRING(val)->len);
                     }
                 }
@@ -1471 +1471 @@
                 val = rb_obj_as_string(value);
                 df->destroy_data = true;
-                df_add_data_len(df, nstrdup(val), RSTRING(val)->len);
+                df_add_data_len(df, rstrdup(val), RSTRING(val)->len);
                 break;
         }
@@ -1501 +1501 @@
                 for (i = 0; i < RARRAY(rdoc)->len; i++) {
                     val = rb_obj_as_string(RARRAY(rdoc)->ptr[i]);
-                    df_add_data_len(df, nstrdup(val), RSTRING(val)->len);
+                    df_add_data_len(df, rstrdup(val), RSTRING(val)->len);
                 }
                 doc_add_field(doc, df);
@@ -1517 +1517 @@
         default:
             val = rb_obj_as_string(rdoc);
-            df = df_add_data_len(df_new("content"), nstrdup(val),
+            df = df_add_data_len(df_new("content"), rstrdup(val),
                                  RSTRING(val)->len);
             df->destroy_data = true;

ruby/ext/r_qparser.c

@@ +1 @@
+#include "intern.h"
 #include "ferret.h"
 #include "search.h"
@@ -52 +53 @@
     if (rfields == Qnil) return NULL;
 
-    fields = hs_new_str(&free);
+    fields = hs_new_str(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));
+            hs_add(fields, (char *)rintern(rval));
         }
     } else {
@@ -65 +66 @@
             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);
         }
@@ -176 +177 @@
     }
     if (all_fields == NULL) {
-        all_fields = hs_new_str(&free);
+        all_fields = hs_new_str(NULL);
     }
 
@@ -289 +290 @@
     }
     if (fields == NULL) {
-        fields = hs_new_str(&free);
+        fields = hs_new_str(NULL);
     }
     hs_destroy(qp->all_fields);