X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fcclqual.c;h=8f9a4e8009e4cc01e4bd7c29516406611fba3c34;hp=d196a00caa34a53e424b4e4c2be9f3bf6b69c125;hb=323805b6779bcf1befdc7cdd7f10c23b06885e0d;hpb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35 diff --git a/src/cclqual.c b/src/cclqual.c index d196a00..8f9a4e8 100644 --- a/src/cclqual.c +++ b/src/cclqual.c @@ -1,8 +1,8 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ -/** +/** * \file cclqual.c * \brief Implements CCL qualifier utilities */ @@ -85,28 +85,41 @@ void ccl_qual_add_special(CCL_bibset bibset, const char *n, const char *cp) yaz_tok_cfg_t yt = yaz_tok_cfg_create(); int t; size_t i = 0; - + yaz_tok_parse_t tp = yaz_tok_parse_buf(yt, cp); - + yaz_tok_cfg_destroy(yt); - + t = yaz_tok_move(tp); while (t == YAZ_TOK_STRING) { if (i >= no-1) vlist = (char **) xrealloc(vlist, (no = no * 2) * sizeof(*vlist)); vlist[i++] = xstrdup(yaz_tok_parse_string(tp)); - t = yaz_tok_move(tp); + t = yaz_tok_move(tp); } vlist[i] = 0; ccl_qual_add_special_ar(bibset, n, (const char **) vlist); - + yaz_tok_parse_destroy(tp); } +static struct ccl_qualifier *ccl_qual_new(CCL_bibset b, const char *name) +{ + struct ccl_qualifier *q; + q = (struct ccl_qualifier *)xmalloc(sizeof(*q)); + ccl_assert(q); + q->next = b->list; + b->list = q; + q->name = xstrdup(name); + q->attr_list = 0; + q->no_sub = 0; + q->sub = 0; + return q; +} /** \brief adds specifies qualifier aliases - + \param b bibset \param n qualifier name \param names list of qualifier aliases @@ -124,18 +137,22 @@ void ccl_qual_add_combi(CCL_bibset b, const char *n, const char **names) q->attr_list = 0; q->next = b->list; b->list = q; - + for (i = 0; names[i]; i++) ; q->no_sub = i; q->sub = (struct ccl_qualifier **) xmalloc(sizeof(*q->sub) * (1+q->no_sub)); for (i = 0; names[i]; i++) + { q->sub[i] = ccl_qual_lookup(b, names[i], strlen(names[i])); + if (!q->sub[i]) + q->sub[i] = ccl_qual_new(b, names[i]); + } } /** \brief adds specifies attributes for qualifier - + \param b bibset \param name qualifier name \param no number of attribute type+value pairs @@ -157,19 +174,7 @@ void ccl_qual_add_set(CCL_bibset b, const char *name, int no, if (!strcmp(name, q->name)) break; if (!q) - { - q = (struct ccl_qualifier *)xmalloc(sizeof(*q)); - ccl_assert(q); - - q->next = b->list; - b->list = q; - - q->name = xstrdup(name); - q->attr_list = 0; - - q->no_sub = 0; - q->sub = 0; - } + q = ccl_qual_new(b, name); attrp = &q->attr_list; while (*attrp) attrp = &(*attrp)->next; @@ -206,14 +211,14 @@ CCL_bibset ccl_qual_mk(void) { CCL_bibset b = (CCL_bibset)xmalloc(sizeof(*b)); ccl_assert(b); - b->list = NULL; + b->list = NULL; b->special = NULL; return b; } /** \brief destroys Bibset \param b pointer to Bibset - + *b will be set to NULL. */ void ccl_qual_rm(CCL_bibset *b) @@ -259,7 +264,78 @@ void ccl_qual_rm(CCL_bibset *b) *b = NULL; } -ccl_qualifier_t ccl_qual_search(CCL_parser cclp, const char *name, +CCL_bibset ccl_qual_dup(CCL_bibset b) +{ + CCL_bibset n = ccl_qual_mk(); + struct ccl_qualifier *q, **qp; + struct ccl_qualifier_special *s, **sp; + + qp = &n->list; + for (q = b->list; q; q = q->next) + { + struct ccl_rpn_attr *attr, **attrp; + *qp = xmalloc(sizeof(**qp)); + (*qp)->next = 0; + (*qp)->attr_list = 0; + (*qp)->name = xstrdup(q->name); + + attrp = &(*qp)->attr_list; + for (attr = q->attr_list; attr; attr = attr->next) + { + *attrp = xmalloc(sizeof(**attrp)); + (*attrp)->next = 0; + (*attrp)->set = attr->set ? xstrdup(attr->set) : 0; + (*attrp)->type = attr->type; + (*attrp)->kind = attr->kind; + if (attr->kind == CCL_RPN_ATTR_NUMERIC) + (*attrp)->value.numeric = attr->value.numeric; + else if (attr->kind == CCL_RPN_ATTR_STRING) + (*attrp)->value.str = xstrdup(attr->value.str); + + attrp = &(*attrp)->next; + } + (*qp)->no_sub = q->no_sub; + if (!q->sub) + (*qp)->sub = 0; + else + { + /* fix up the sub qualifiers.. */ + int i; + (*qp)->sub = xmalloc(sizeof(*q->sub) * (q->no_sub + 1)); + for (i = 0; i < q->no_sub; i++) + { + struct ccl_qualifier *q1, *q2; + + /* sweep though original and match up the corresponding ent */ + q2 = n->list; + for (q1 = b->list; q1 && q2; q1 = q1->next, q2 = q2->next) + if (q1 == q->sub[i]) + break; + (*qp)->sub[i] = q2; + } + } + qp = &(*qp)->next; + } + sp = &n->special; + for (s = b->special; s; s = s->next) + { + int i; + + for (i = 0; s->values[i]; i++) + ; + *sp = xmalloc(sizeof(**sp)); + (*sp)->next = 0; + (*sp)->name = xstrdup(s->name); + (*sp)->values = xmalloc(sizeof(*(*sp)->values) * (i+1)); + for (i = 0; s->values[i]; i++) + (*sp)->values[i] = xstrdup(s->values[i]); + (*sp)->values[i] = 0; + sp = &(*sp)->next; + } + return n; +} + +ccl_qualifier_t ccl_qual_search(CCL_parser cclp, const char *name, size_t name_len, int seq) { struct ccl_qualifier *q = 0; @@ -308,6 +384,15 @@ struct ccl_rpn_attr *ccl_qual_get_attr(ccl_qualifier_t q) return q->attr_list; } +struct ccl_rpn_attr *ccl_parser_qual_search(CCL_parser cclp, const char *name, + size_t name_len) +{ + ccl_qualifier_t q = ccl_qual_search(cclp, name, name_len, 0); + if (q) + return q->attr_list; + return 0; +} + const char *ccl_qual_get_name(ccl_qualifier_t q) { return q->name; @@ -342,7 +427,7 @@ int ccl_search_stop(CCL_bibset bibset, const char *qname, { int i; for (i = 0; slist[i]; i++) - if (src_len == strlen(slist[i]) + if (src_len == strlen(slist[i]) && ccl_memicmp(slist[i], src_str, src_len) == 0) return 1; }