CCL: fix r=o, r=r WRT inherited attributes YAZ-864

[yaz-moved-to-github.git] / src / cclfind.c

diff --git a/src/cclfind.c b/src/cclfind.c
index 0ef140b..29fc5fe 100644 (file)
--- a/src/cclfind.c
+++ b/src/cclfind.c
@@ -130,54 +130,6 @@ static struct ccl_rpn_node *ccl_rpn_node_mkbool(struct ccl_rpn_node *l,
     return l;
 }
 
-static struct ccl_rpn_node *ccl_rpn_dup(struct ccl_rpn_node *rpn)
-{
-    struct ccl_rpn_node *n;
-    struct ccl_rpn_attr *attr, **attrp;
-    if (!rpn)
-        return 0;
-    n = ccl_rpn_node_create(rpn->kind);
-    switch (rpn->kind)
-    {
-    case CCL_RPN_AND:
-    case CCL_RPN_OR:
-    case CCL_RPN_NOT:
-        n->u.p[0] = ccl_rpn_dup(rpn->u.p[0]);
-        n->u.p[1] = ccl_rpn_dup(rpn->u.p[1]);
-        break;
-    case CCL_RPN_TERM:
-        n->u.t.term = xstrdup(rpn->u.t.term);
-        n->u.t.qual = rpn->u.t.qual ? xstrdup(rpn->u.t.qual) : 0;
-        attrp = &n->u.t.attr_list;
-        for (attr = rpn->u.t.attr_list; attr; attr = attr->next)
-        {
-            *attrp = (struct ccl_rpn_attr *) xmalloc(sizeof(**attrp));
-            (*attrp)->kind = attr->kind;
-            (*attrp)->type = attr->type;
-            if (attr->kind == CCL_RPN_ATTR_STRING)
-                (*attrp)->value.str = xstrdup(attr->value.str);
-            else
-                (*attrp)->value.numeric = attr->value.numeric;
-            if (attr->set)
-                (*attrp)->set = xstrdup(attr->set);
-            else
-                (*attrp)->set = 0;
-            attrp = &(*attrp)->next;
-        }
-        *attrp = 0;
-        break;
-    case CCL_RPN_SET:
-        n->u.setname = xstrdup(rpn->u.setname);
-        break;
-    case CCL_RPN_PROX:
-        n->u.p[0] = ccl_rpn_dup(rpn->u.p[0]);
-        n->u.p[1] = ccl_rpn_dup(rpn->u.p[1]);
-        n->u.p[2] = ccl_rpn_dup(rpn->u.p[2]);
-        break;
-    }
-    return n;
-}
-
 /**
  * ccl_rpn_delete: Delete RPN tree.
  * rpn:   Pointer to tree.
@@ -262,6 +214,24 @@ void ccl_add_attr_numeric(struct ccl_rpn_node *p, const char *set,
     n->value.numeric = value;
 }
 
+void ccl_set_attr_numeric(struct ccl_rpn_node *p, const char *set,
+                          int type, int value)
+{
+    struct ccl_rpn_attr *n;
+    for (n = p->u.t.attr_list; n; n = n->next)
+        if (n->type == type)
+        {
+            xfree(n->set);
+            n->set = set ? xstrdup(set) : 0;
+            if (n->kind == CCL_RPN_ATTR_STRING)
+                xfree(n->value.str);
+            n->kind = CCL_RPN_ATTR_NUMERIC;
+            n->value.numeric = value;
+            return;
+        }
+    ccl_add_attr_numeric(p, set, type, value);
+}
+
 void ccl_add_attr_string(struct ccl_rpn_node *p, const char *set,
                          int type, char *value)
 {
@@ -634,15 +604,14 @@ static struct ccl_rpn_node *ccl_term_multi_use(CCL_parser cclp,
 }
 
 static struct ccl_rpn_node *split_recur(CCL_parser cclp, ccl_qualifier_t *qa,
-                                        struct ccl_rpn_node *parent,
-                                        struct ccl_token **ar, size_t sz)
+                                        struct ccl_token **ar, size_t sz,
+                                        size_t sub_len)
 {
     size_t l;
     struct ccl_rpn_node *p_top = 0;
     assert(sz > 0);
-    for (l = 1; l <= sz; l++)
+    for (l = 1; l <= sz && l <= sub_len; l++)
     {
-        struct ccl_rpn_node *p1;
         struct ccl_rpn_node *p2 = ccl_term_multi_use(cclp, ar[0],
                                                      qa, l,
                                                      l > 1,
@@ -652,24 +621,18 @@ static struct ccl_rpn_node *split_recur(CCL_parser cclp, ccl_qualifier_t *qa,
             ccl_rpn_delete(p_top);
             return 0;
         }
-        if (parent)
-        {
-            struct ccl_rpn_node *tmp = ccl_rpn_node_create(CCL_RPN_AND);
-            tmp->u.p[0] = l > 1 ? ccl_rpn_dup(parent) : parent;
-            tmp->u.p[1] = p2;
-            p2 = tmp;
-        }
         if (sz > l)
-            p1 = split_recur(cclp, qa, p2, ar + l, sz - l);
-        else
-            p1 = p2;
-        if (!p1)
         {
-            ccl_rpn_delete(p2);
-            ccl_rpn_delete(p_top);
-            return 0;
+            struct ccl_rpn_node *p1 = split_recur(cclp, qa, ar + l, sz - l,
+                sub_len);
+            if (!p1)
+            {
+                ccl_rpn_delete(p2);
+                return 0;
+            }
+            p2 = ccl_rpn_node_mkbool(p2, p1, CCL_RPN_AND);
         }
-        p_top = ccl_rpn_node_mkbool(p_top, p1, CCL_RPN_OR);
+        p_top = ccl_rpn_node_mkbool(p_top, p2, CCL_RPN_OR);
     }
     assert(p_top);
     return p_top;
@@ -682,7 +645,7 @@ static struct ccl_rpn_node *search_term_split_list(CCL_parser cclp,
     struct ccl_rpn_node *p;
     struct ccl_token **ar;
     struct ccl_token *lookahead = cclp->look_token;
-    size_t i, sz;
+    size_t i, sz, sub_len;
     for (sz = 0; is_term_ok(lookahead->kind, term_list); sz++)
         lookahead = lookahead->next;
     if (sz == 0)
@@ -697,7 +660,14 @@ static struct ccl_rpn_node *search_term_split_list(CCL_parser cclp,
         ar[i] = lookahead;
         lookahead = lookahead->next;
     }
-    p = split_recur(cclp, qa, 0, ar, sz);
+    /* choose sub phrase carefully to avoid huge expansions */
+    if (sz >= 7)
+        sub_len = 1;
+    else if (sz >= 5)
+        sub_len = 2;
+    else
+        sub_len = 3;
+    p = split_recur(cclp, qa, ar, sz, sub_len);
     xfree(ar);
     for (i = 0; i < sz; i++)
         ADVANCE;
@@ -944,14 +914,14 @@ struct ccl_rpn_node *qualifiers_order(CCL_parser cclp,
             }
             p = ccl_rpn_node_create(CCL_RPN_AND);
             p->u.p[0] = p1;
-            ccl_add_attr_numeric(p1, attset, CCL_BIB1_REL, 4);
+            ccl_set_attr_numeric(p1, attset, CCL_BIB1_REL, 4);
             p->u.p[1] = p2;
-            ccl_add_attr_numeric(p2, attset, CCL_BIB1_REL, 2);
+            ccl_set_attr_numeric(p2, attset, CCL_BIB1_REL, 2);
             return p;
         }
         else                       /* = term -    */
         {
-            ccl_add_attr_numeric(p1, attset, CCL_BIB1_REL, 4);
+            ccl_set_attr_numeric(p1, attset, CCL_BIB1_REL, 4);
             return p1;
         }
     }
@@ -962,7 +932,7 @@ struct ccl_rpn_node *qualifiers_order(CCL_parser cclp,
         ADVANCE;
         if (!(p = search_term(cclp, ap)))
             return NULL;
-        ccl_add_attr_numeric(p, attset, CCL_BIB1_REL, 2);
+        ccl_set_attr_numeric(p, attset, CCL_BIB1_REL, 2);
         return p;
     }
     else
@@ -971,7 +941,7 @@ struct ccl_rpn_node *qualifiers_order(CCL_parser cclp,
             return NULL;
         if (rel != 3 ||
             !qual_val_type(ap, CCL_BIB1_REL, CCL_BIB1_REL_OMIT_EQUALS, 0))
-            ccl_add_attr_numeric(p, attset, CCL_BIB1_REL, rel);
+            ccl_set_attr_numeric(p, attset, CCL_BIB1_REL, rel);
         return p;
     }
     return NULL;