Changeset 294d6fdf2503283b97bc859af2e7b875a85a6eea

Timestamp:

04/23/08 20:21:34 (9 months ago)

Author:

David Balmain <dbalmain@…>

Parents:

8f9e905705f715e2dc4745a098e9a1819271873a

Children:

ac6c089c859ffd951ffd9839fd3ec6b1f8703a0b, af195088ac05210716bf17da06c341a7d5469e58

git-committer:

David Balmain <dbalmain@gmail.com> / 2008-04-23T20:21:34Z+1000

Message:

Updated Ruby bindings

Files:

• c/src/ind.c (modified) (1 diff)
• c/src/q_parser.c (modified) (3 diffs)
• c/src/q_parser.y (modified) (3 diffs)
• c/test/test_q_parser.c (modified) (1 diff)
• ruby/ext/r_qparser.c (modified) (6 diffs)

c/src/ind.c

@@ -5 +5 @@
 
 
-static const char * NON_UNIQUE_KEY_ERROR_MSG = "Tried to use a key that was not unique";
+static const char *NON_UNIQUE_KEY_ERROR_MSG =
+    "Tried to use a key that was not unique";
 
 static const char *ID_STRING = "id";

c/src/q_parser.c

@@ -2199 +2199 @@
                  " was %s", buf, (char *)msg);
     }
+    while (qp->fields_top->next != NULL) {
+        qp_pop_fields(qp);
+    }
     return 0;
 }
@@ -2859 +2862 @@
 void qp_destroy(QParser *self)
 {
-    hs_destroy(self->tokenized_fields);
-    hs_destroy(self->def_fields);
+    if (self->tokenized_fields != self->all_fields) {
+        hs_destroy(self->tokenized_fields);
+    }
+    if (self->def_fields != self->all_fields) {
+        hs_destroy(self->def_fields);
+    }
     hs_destroy(self->all_fields);
 
@@ -3047 +3054 @@
     Query *volatile q = NULL;
     qp->recovering = true;
+    assert(qp->fields_top->next == NULL);
     FLDS(q, get_term_q(qp, field, str));
     return q;

c/src/q_parser.y

@@ -462 +462 @@
                  " was %s", buf, (char *)msg);
     }
+    while (qp->fields_top->next != NULL) {
+        qp_pop_fields(qp);
+    }
     return 0;
 }
@@ -1122 +1125 @@
 void qp_destroy(QParser *self)
 {
-    hs_destroy(self->tokenized_fields);
-    hs_destroy(self->def_fields);
+    if (self->tokenized_fields != self->all_fields) {
+        hs_destroy(self->tokenized_fields);
+    }
+    if (self->def_fields != self->all_fields) {
+        hs_destroy(self->def_fields);
+    }
     hs_destroy(self->all_fields);
 
@@ -1310 +1317 @@
     Query *volatile q = NULL;
     qp->recovering = true;
+    assert(qp->fields_top->next == NULL);
     FLDS(q, get_term_q(qp, field, str));
     return q;

c/test/test_q_parser.c

@@ -75 +75 @@
         {"()", ""},
         {"field:()", ""},
+        {"one AND (f1:two OR f2:three) AND four",
+            "+one +(f1:two f2:three) +four"},
         {"xx:\"Hello Newman\" field:()", "\"hello newman\" ()"},
         {"one (two AND three)", "one (+two +three)"},

ruby/ext/r_qparser.c

@@ -53 +53 @@
     if (rfields == Qnil) return NULL;
 
-    fields = hs_new_str(NULL);
+    fields = hs_new_ptr(NULL);
     if (TYPE(rfields) == T_ARRAY) {
         int i;
@@ -77 +77 @@
     }
     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);
+    }
 }
 
@@ -177 +186 @@
     }
     if (all_fields == NULL) {
-        all_fields = hs_new_str(NULL);
+        all_fields = hs_new_ptr(NULL);
     }
 
@@ -184 +193 @@
     }
 
-    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;
@@ -286 +306 @@
     HashSet *fields = frb_get_fields(rfields);
 
-    if (qp->def_fields == qp->all_fields) {
-        qp->def_fields = NULL;
-    }
+    /* 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 (fields == NULL) {
-        fields = hs_new_str(NULL);
-    }
+        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;
@@ -338 +370 @@
 {
     GET_QP;
-    if (qp->tokenized_fields) hs_destroy(qp->tokenized_fields);
+    if (qp->tokenized_fields != qp->all_fields) {
+        hs_destroy(qp->tokenized_fields);
+    }
     qp->tokenized_fields = frb_get_fields(rfields);
     return self;