isomorfeus-ferret 0.12.7 → 0.13.2

data/ext/isomorfeus_ferret_ext/test_highlighter.c

@@ -3,6 +3,8 @@
 #include "testhelper.h"
 #include "test.h"
 
+#undef close
+
 #define ARRAY_SIZE 100
 
 static void test_match_vector(TestCase *tc, void *data)
@@ -79,7 +81,7 @@ static void test_match_vector(TestCase *tc, void *data)
 
 static void make_index(FrtStore *store)
 {
-    FrtFieldInfos *fis = frt_fis_new(FRT_STORE_YES, FRT_INDEX_YES,
+    FrtFieldInfos *fis = frt_fis_new(FRT_STORE_YES, FRT_COMPRESSION_NONE, FRT_INDEX_YES,
                               FRT_TERM_VECTOR_WITH_POSITIONS_OFFSETS);
     frt_index_create(store, fis);
     frt_fis_deref(fis);
@@ -87,13 +89,14 @@ static void make_index(FrtStore *store)
 
 static void add_string_docs(FrtStore *store, const char *string[])
 {
-    FrtIndexWriter *iw = frt_iw_open(store, frt_whitespace_analyzer_new(true), NULL);
+    FrtIndexWriter *iw = frt_iw_open(NULL, store, frt_whitespace_analyzer_new(true), NULL);
+    rb_encoding *enc = rb_enc_find("ASCII-8BIT");
 
     while (*string) {
         FrtDocument *doc = frt_doc_new();
-        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("field")), (char *)*string));
+        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("field")), (char *)*string, enc));
         frt_iw_add_doc(iw, doc);
-       frt_doc_destroy(doc);
+        frt_doc_destroy(doc);
         string++;
     }
     frt_iw_close(iw);
@@ -102,7 +105,7 @@ static void add_string_docs(FrtStore *store, const char *string[])
 #define Chk_sea_mv(query, doc_num, expected) check_searcher_match_vector(tc, store, query, doc_num, expected)
 static void check_searcher_match_vector(TestCase *tc, FrtStore *store, FrtQuery *query, int doc_num, const char *expected)
 {
-    FrtIndexReader *ir = frt_ir_open(store);
+    FrtIndexReader *ir = frt_ir_open(NULL, store);
     FrtSearcher *sea = frt_isea_new(ir);
     FrtMatchVector *mv = frt_searcher_get_match_vector(sea, query, doc_num, rb_intern("field"));
     static int offset_array[ARRAY_SIZE];
@@ -122,7 +125,7 @@ static void check_searcher_match_vector(TestCase *tc, FrtStore *store, FrtQuery
 #define Chk_mv(query, doc_num, expected) check_match_vector(tc, store, query, doc_num, expected)
 static void check_match_vector(TestCase *tc, FrtStore *store, FrtQuery *query, int doc_num, const char *expected)
 {
-    FrtIndexReader *ir = frt_ir_open(store);
+    FrtIndexReader *ir = frt_ir_open(NULL, store);
     FrtMatchVector *mv = frt_matchv_new();
     FrtTermVector *term_vector = ir->term_vector(ir, doc_num, rb_intern("field"));
     static int offset_array[ARRAY_SIZE];
@@ -365,17 +368,18 @@ static void test_searcher_highlight(TestCase *tc, void *data)
         NULL
     };
     FrtDocument *doc = frt_doc_new();
+    rb_encoding *enc = rb_enc_find("ASCII-8BIT");
 
     make_index(store);
     add_string_docs(store, docs);
 
-    iw = frt_iw_open(store, frt_letter_analyzer_new(true), NULL);
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("field")), (char *)"That's how it goes now."));
+    iw = frt_iw_open(NULL, store, frt_letter_analyzer_new(true), NULL);
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern("field")), (char *)"That's how it goes now.", enc));
     frt_iw_add_doc(iw, doc);
-   frt_doc_destroy(doc);
+    frt_doc_destroy(doc);
     frt_iw_close(iw);
 
-    ir = frt_ir_open(store);
+    ir = frt_ir_open(NULL, store);
     sea = frt_isea_new(ir);
 
     q = frt_tq_new(rb_intern("field"), "one");
@@ -529,7 +533,7 @@ static void test_searcher_highlight(TestCase *tc, void *data)
 
 TestSuite *ts_highlighter(TestSuite *suite)
 {
-    FrtStore *store = frt_open_ram_store();
+    FrtStore *store = frt_open_ram_store(NULL);
 
     suite = ADD_SUITE(suite);