X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=ccl%2Fcclqual.c;h=b0ec3f2b13ff41ea42eb0aefbc11f22cded8f370;hb=fed4c59a3c26f04ba3764947aa2f7ecdd9b46889;hp=5dcbd727ce9d1c4ecb23f8ebf70f203605072723;hpb=cb9bad819f13e44d7af6753bfa1bc8274ca37b9b;p=yaz-moved-to-github.git

diff --git a/ccl/cclqual.c b/ccl/cclqual.c
index 5dcbd72..b0ec3f2 100644
--- a/ccl/cclqual.c
+++ b/ccl/cclqual.c
@@ -44,7 +44,7 @@
 /* CCL qualifiers
  * Europagate, 1995
  *
- * $Id: cclqual.c,v 1.16 2001-11-27 22:38:50 adam Exp $
+ * $Id: cclqual.c,v 1.19 2003-06-23 10:22:21 adam Exp $
  *
  * Old Europagate Log:
  *
@@ -118,10 +118,10 @@ void ccl_qual_add_special (CCL_bibset bibset, const char *n, const char *v)
     for (p = bibset->special; p && strcmp(p->name, n); p = p->next)
 	;
     if (p)
-	free (p->value);
+	xfree (p->value);
     else
     {
-	p = (struct ccl_qualifier_special *) malloc (sizeof(*p));
+	p = (struct ccl_qualifier_special *) xmalloc (sizeof(*p));
 	p->name = ccl_strdup (n);
 	p->value = 0;
 	p->next = bibset->special;
@@ -132,7 +132,7 @@ void ccl_qual_add_special (CCL_bibset bibset, const char *n, const char *v)
     for (pe = v + strlen(v); pe != v; --pe)
 	if (!strchr(" \n\r\t", pe[-1]))
 	    break;
-    p->value = (char*) malloc (pe - v + 1);
+    p->value = (char*) xmalloc (pe - v + 1);
     if (pe - v)
 	memcpy (p->value, v, pe - v);
     p->value[pe - v] = '\0';
@@ -165,7 +165,7 @@ void ccl_qual_add_combi (CCL_bibset b, const char *n, const char *names)
 	;
     if (q)
         return ;
-    q = (struct ccl_qualifier *) malloc (sizeof(*q));
+    q = (struct ccl_qualifier *) xmalloc (sizeof(*q));
     q->name = ccl_strdup (n);
     q->attr_list = 0;
     q->next = b->list;
@@ -175,7 +175,7 @@ void ccl_qual_add_combi (CCL_bibset b, const char *n, const char *names)
     for (i = 0; next_token(&cp, 0); i++)
         ;
     q->no_sub = i;
-    q->sub = (struct ccl_qualifier **) malloc (sizeof(*q->sub) *
+    q->sub = (struct ccl_qualifier **) xmalloc (sizeof(*q->sub) *
                                                (1+q->no_sub));
     cp = names;
     for (i = 0; (len = next_token(&cp, &cp1)); i++)
@@ -193,7 +193,9 @@ void ccl_qual_add_combi (CCL_bibset b, const char *n, const char *names)
  * pairs:   Attributes. pairs[0] first type, pair[1] first value,
  *          ... pair[2*no-2] last type, pair[2*no-1] last value.
  */
-void ccl_qual_add_set (CCL_bibset b, const char *name, int no, int *pairs,
+
+void ccl_qual_add_set (CCL_bibset b, const char *name, int no,
+		       int *type_ar, int *value_ar, char **svalue_ar,
 		       char **attsets)
 {
     struct ccl_qualifier *q;
@@ -206,7 +208,7 @@ void ccl_qual_add_set (CCL_bibset b, const char *name, int no, int *pairs,
     if (!q)
     {
         struct ccl_qualifier *new_qual =
-	    (struct ccl_qualifier *)malloc (sizeof(*new_qual));
+	    (struct ccl_qualifier *)xmalloc (sizeof(*new_qual));
         ccl_assert (new_qual);
         
         new_qual->next = b->list;
@@ -220,8 +222,8 @@ void ccl_qual_add_set (CCL_bibset b, const char *name, int no, int *pairs,
     }
     else
     {
-        if (q->sub)
-            free (q->sub);
+        if (q->sub)  /* suspect.. */
+            xfree (q->sub);
         attrp = &q->attr_list;
         while (*attrp)
             attrp = &(*attrp)->next;
@@ -230,11 +232,22 @@ void ccl_qual_add_set (CCL_bibset b, const char *name, int no, int *pairs,
     {
         struct ccl_rpn_attr *attr;
 
-        attr = (struct ccl_rpn_attr *)malloc (sizeof(*attr));
+        attr = (struct ccl_rpn_attr *)xmalloc (sizeof(*attr));
         ccl_assert (attr);
 	attr->set = *attsets++;
-        attr->type = *pairs++;
-        attr->value = *pairs++;
+        attr->type = *type_ar++;
+	if (*svalue_ar)
+	{
+	    attr->kind = CCL_RPN_ATTR_STRING;
+	    attr->value.str = *svalue_ar;
+	}
+	else
+	{
+	    attr->kind = CCL_RPN_ATTR_NUMERIC;
+	    attr->value.numeric = *value_ar;
+	}
+	svalue_ar++;
+	value_ar++;
         *attrp = attr;
         attrp = &attr->next;
     }
@@ -247,7 +260,7 @@ void ccl_qual_add_set (CCL_bibset b, const char *name, int no, int *pairs,
  */
 CCL_bibset ccl_qual_mk (void)
 {
-    CCL_bibset b = (CCL_bibset)malloc (sizeof(*b));
+    CCL_bibset b = (CCL_bibset)xmalloc (sizeof(*b));
     ccl_assert (b);
     b->list = NULL;     
     b->special = NULL;
@@ -273,23 +286,25 @@ void ccl_qual_rm (CCL_bibset *b)
 	{
 	    attr1 = attr->next;
 	    if (attr->set)
-		free (attr->set);
-	    free (attr);
+		xfree(attr->set);
+	    if (attr->kind == CCL_RPN_ATTR_STRING)
+		xfree(attr->value.str);
+	    xfree (attr);
 	}
         q1 = q->next;
-	free (q->name);
+	xfree (q->name);
         if (q->sub)
-            free (q->sub);
-	free (q);
+            xfree (q->sub);
+	xfree (q);
     }
     for (sp = (*b)->special; sp; sp = sp1)
     {
 	sp1 = sp->next;
-	free (sp->name);
-	free (sp->value);
-	free (sp);
+	xfree (sp->name);
+	xfree (sp->value);
+	xfree (sp);
     }
-    free (*b);
+    xfree (*b);
     *b = NULL;
 }
 
@@ -305,14 +320,21 @@ struct ccl_rpn_attr *ccl_qual_search (CCL_parser cclp,
                                       int seq)
 {
     struct ccl_qualifier *q;
+    const char *aliases;
+    int case_sensitive = cclp->ccl_case_sensitive;
 
     ccl_assert (cclp);
     if (!cclp->bibset)
 	return NULL;
+
+    aliases = ccl_qual_search_special(cclp->bibset, "case");
+    if (aliases)
+	case_sensitive = atoi(aliases);
+
     for (q = cclp->bibset->list; q; q = q->next)
         if (strlen(q->name) == len)
         {
-            if (cclp->ccl_case_sensitive)
+            if (case_sensitive)
             {
                 if (!memcmp (name, q->name, len))
                     break;