CCL: fix use of "term" field in sub queries

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

diff --git a/src/cclqual.c b/src/cclqual.c
index de44650..73b103b 100644 (file)
--- a/src/cclqual.c
+++ b/src/cclqual.c
@@ -1,13 +1,15 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2012 Index Data
  * See the file LICENSE for details.
- *
- * $Id: cclqual.c,v 1.13 2008-01-09 21:32:28 adam Exp $
  */
 /** 
  * \file cclqual.c
  * \brief Implements CCL qualifier utilities
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -257,6 +259,77 @@ void ccl_qual_rm(CCL_bibset *b)
     *b = NULL;
 }
 
+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)
 {
@@ -350,6 +423,7 @@ int ccl_search_stop(CCL_bibset bibset, const char *qname,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab