Changeset ad7faee95a07fccb5ea03fcc0e0875729617ab0c

Timestamp:

04/24/08 21:01:45 (9 months ago)

Author:

dave <dave@…>

Parents:

950230a7439939cd389e7ab03bf78d6fe7860560

Children:

0a55ed69e9335dedb34800a9364559814f7b38ee

git-committer:

dave <dave@06fd6eb0-0002-0410-a719-e5602cce40bc> / 2008-04-24T11:01:45Z+0000

Message:

Got all the tests passing with new Symbols

Much easier than I thought it would be.

git-svn-id: svn+ssh://davebalmain.com/home/dave/repos/ferret/trunk@1040 06fd6eb0-0002-0410-a719-e5602cce40bc

Location:

c

Files:

• src/analysis.c (modified) (1 diff)
• src/document.c (modified) (2 diffs)
• src/index.c (modified) (1 diff)
• src/q_parser.c (modified) (1 diff)
• src/q_parser.y (modified) (1 diff)
• src/q_phrase.c (modified) (1 diff)
• src/q_span.c (modified) (2 diffs)
• test/test_filter.c (modified) (2 diffs)
• test/test_q_parser.c (modified) (1 diff)
• test/test_q_span.c (modified) (1 diff)
• test/test_search.c (modified) (1 diff)
• test/test_sort.c (modified) (2 diffs)
• test/test_symbol.c (modified) (1 diff)

c/src/analysis.c

@@ -1580 +1580 @@
 
     PFA(a)->default_a = default_a;
-    PFA(a)->dict = h_new_str(NULL, &pfa_sub_a_destroy_i);
+    PFA(a)->dict = h_new_ptr(&pfa_sub_a_destroy_i);
 
     a->destroy_i = &pfa_destroy_i;

c/src/document.c

@@ -102 +102 @@
 {
     Document *doc = ALLOC(Document);
-    doc->field_dict = h_new_str(NULL, (free_ft)&df_destroy);
+    doc->field_dict = h_new_ptr((free_ft)&df_destroy);
     doc->size = 0;
     doc->capa = DOC_INIT_CAPA;
@@ -114 +114 @@
     if (!h_set_safe(doc->field_dict, df->name, df)) {
         RAISE(EXCEPTION, "tried to add %s field which alread existed\n",
-              (const char *)df->name);
+              S(df->name));
     }
     if (doc->size >= doc->capa) {

c/src/index.c

@@ -285 +285 @@
 {
     FieldInfo *fi = ALLOC(FieldInfo);
+    assert(NULL != name);
     fi_check_params(store, index, term_vector);
     fi->name = name;

c/src/q_parser.c

@@ -224 +224 @@
             q = func;\
         } else {\
-            Query *volatile sq;HashSetEntry *volatile hse;\
+            Query *volatile sq; HashSetEntry *volatile hse;\
             q = bq_new_max(false, qp->max_clauses);\
             for (hse = qp->fields->first; hse; hse = hse->next) {\

c/src/q_parser.y

@@ -172 +172 @@
             q = func;\
         } else {\
-            Query *volatile sq;HashSetEntry *volatile hse;\
+            Query *volatile sq; HashSetEntry *volatile hse;\
             q = bq_new_max(false, qp->max_clauses);\
             for (hse = qp->fields->first; hse; hse = hse->next) {\

c/src/q_phrase.c

@@ -899 +899 @@
 
     if (phq->pos_cnt == 0) {
-        if (default_field == phq->field) {
+        if (default_field != phq->field) {
             return strfmt("%s:\"\"", phq->field);
         }

c/src/q_span.c

@@ -22 +22 @@
 static unsigned long spanq_hash(Query *self)
 {
-    return sym_hash(SpQ(self)->field);
+    return SpQ(self)->field ? sym_hash(SpQ(self)->field) : 0;
 }
 
@@ -1779 +1779 @@
     SpFQ(self)->end         = end;
 
-    // XXX
     SpQ(self)->field        = SpQ(match)->field;
     SpQ(self)->get_spans    = &spanfe_new;

c/test/test_filter.c

@@ -19 +19 @@
     IndexWriter *iw;
     FieldInfos *fis = fis_new(STORE_YES, INDEX_YES, TERM_VECTOR_NO);
+
+    num      = intern("num");
+    date     = intern("date");
+    flipflop = intern("flipflop");
 
     struct FilterData data[FILTER_DOCS_SIZE] = {
@@ -315 +319 @@
     Searcher *searcher;
 
-    num      = intern("num");
-    date     = intern("date");
-    flipflop = intern("flipflop");
-
     suite = ADD_SUITE(suite);
 

c/test/test_q_parser.c

@@ -145 +145 @@
     REF(analyzer);
     parser = qp_new(analyzer);
+    qp_add_field(parser, I("xx"),    true,  true);
+    qp_add_field(parser, I("f1"),    false, true);
+    qp_add_field(parser, I("f2"),    false, true);
+    qp_add_field(parser, I("field"), false, false);
+
+    for (i = 0; i < NELEMS(pairs); i++) {
+        PARSER_TEST(pairs[i].qstr, pairs[i].qres);
+    }
+    parser->clean_str = true;
+    for (i = 0; i < NELEMS(pairs); i++) {
+        PARSER_TEST(pairs[i].qstr, pairs[i].qres);
+    }
+    PARSER_TEST("not_field:word", "");
+    qp_destroy(parser);
+
+    /* This time let the query parser destroy the analyzer */
+    parser = qp_new(analyzer);
+    qp_add_field(parser, I("xx"),    true, true);
     qp_add_field(parser, I("f1"),    false, true);
     qp_add_field(parser, I("f2"),    false, true);

c/test/test_q_span.c

@@ -560 +560 @@
 {
     Store *store = open_ram_store();
+    field = intern("field");
     span_test_setup(store);
-
-    field = intern("field");
 
     suite = ADD_SUITE(suite);

c/test/test_search.c

@@ -1303 +1303 @@
     Searcher *searcher;
 
+    date    = intern("date");
+    field   = intern("field");
+    cat     = intern("cat");
+    number  = intern("number");
+
     suite = ADD_SUITE(suite);
 

c/test/test_sort.c

@@ -313 +313 @@
     Searcher *sea, **searchers;
     Store *store = open_ram_store(), *fs_store;
-    sort_test_setup(store);
 
     search = intern("search");
@@ -319 +318 @@
     integer = intern("integer");
     flt = intern("flt");
+
+    sort_test_setup(store);
 
     suite = ADD_SUITE(suite);

c/test/test_symbol.c

@@ -7 +7 @@
     (void)data; /* suppress unused argument warning */
 
-    Asequal("One",   intern("One"));
-    Asequal("Two",   intern("Two"));
-    Asequal("Three", intern("Three"));
-    Asequal("Four",  intern("Four"));
-    Asequal("Five",  intern("Five"));
-    Asequal("One",   intern_and_free(estrdup("One")));
-    Asequal("Two",   intern_and_free(estrdup("Two")));
-    Asequal("Three", intern_and_free(estrdup("Three")));
-    Asequal("Four",  intern_and_free(estrdup("Four")));
-    Asequal("Five",  intern_and_free(estrdup("Five")));
+    Asequal("One",  intern("One"));
+    Asequal("Two",  intern("Two"));
+    Asequal("Three",intern("Three"));
+    Asequal("Four", intern("Four"));
+    Asequal("Five", intern("Five"));
+    Asequal("One",  intern_and_free(estrdup("One")));
+    Asequal("Two",  intern_and_free(estrdup("Two")));
+    Asequal("Three",intern_and_free(estrdup("Three")));
+    Asequal("Four", intern_and_free(estrdup("Four")));
+    Asequal("Five", intern_and_free(estrdup("Five")));
     Asequal("word", word1);
     Asequal("word", word2);