char **attset)
{
int i;
-
if (!qa)
return 0;
for (i = 0; qa[i]; i++)
{
+ int got_type = 0;
struct ccl_rpn_attr *q = ccl_qual_get_attr(qa[i]);
- while (q)
+ for (; q; q = q->next)
{
- if (q->type == type && q->kind == CCL_RPN_ATTR_NUMERIC &&
- q->value.numeric == value)
+ if (q->type == type && q->kind == CCL_RPN_ATTR_NUMERIC)
{
- if (attset)
- *attset = q->set;
- return 1;
+ got_type = 1;
+ if (q->value.numeric == value)
+ {
+ if (attset)
+ *attset = q->set;
+ return 1;
+ }
}
- q = q->next;
}
+ if (got_type)
+ return 0;
}
return 0;
}
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.
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)
{
{
struct ccl_rpn_node *p;
size_t i;
- int relation_value = -1;
- int position_value = -1;
int structure_value = -1;
- int truncation_value = -1;
- int completeness_value = -1;
int left_trunc = 0;
int right_trunc = 0;
{
struct ccl_rpn_attr *attr;
for (attr = ccl_qual_get_attr(qa[i]); attr; attr = attr->next)
- if (attr->type != 1 || !attr_use || attr == attr_use)
+ if (attr->type == 1 && attr_use && attr != attr_use)
+ continue;
+ else
{
switch (attr->kind)
{
{ /* deal only with REAL attributes (positive) */
switch (attr->type)
{
- case CCL_BIB1_REL:
- if (relation_value != -1)
- continue;
- relation_value = attr->value.numeric;
- break;
- case CCL_BIB1_POS:
- if (position_value != -1)
- continue;
- position_value = attr->value.numeric;
- break;
case CCL_BIB1_STR:
if (structure_value != -1)
continue;
structure_value = attr->value.numeric;
break;
- case CCL_BIB1_TRU:
- if (truncation_value != -1)
- continue;
- truncation_value = attr->value.numeric;
- break;
- case CCL_BIB1_COM:
- if (completeness_value != -1)
- continue;
- completeness_value = attr->value.numeric;
- break;
}
ccl_add_attr_numeric(p, attr->set, attr->type,
attr->value.numeric);
}
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,
/* auto_group */0);
if (!p2)
- 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;
+ ccl_rpn_delete(p_top);
+ return 0;
}
if (sz > l)
- p1 = split_recur(cclp, qa, p2, ar + l, sz - l);
- else
- p1 = p2;
- p_top = ccl_rpn_node_mkbool(p_top, p1, CCL_RPN_OR);
+ {
+ 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, p2, CCL_RPN_OR);
}
assert(p_top);
return p_top;
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)
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;
}
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;
}
}
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
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;
projects / yaz-moved-to-github.git / blobdiff