* Europagate, 1995
*
* $Log: cclqual.c,v $
- * Revision 1.9 1998-02-11 11:53:33 adam
+ * Revision 1.13 2000-01-31 13:15:21 adam
+ * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
+ * that some characters are not surrounded by spaces in resulting term.
+ * ILL-code updates.
+ *
+ * Revision 1.12 1999/11/30 13:47:11 adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.11 1999/03/31 11:15:37 adam
+ * Fixed memory leaks in ccl_find_str and ccl_qual_rm.
+ *
+ * Revision 1.10 1998/07/07 15:49:40 adam
+ * Added braces to avoid warning.
+ *
+ * Revision 1.9 1998/02/11 11:53:33 adam
* Changed code so that it compiles as C++.
*
* Revision 1.8 1997/09/29 08:56:38 adam
#include <stdio.h>
#include <stdlib.h>
-#include <assert.h>
#include <string.h>
-#include <ccl.h>
+#include <yaz/ccl.h>
/* Definition of CCL_bibset pointer */
struct ccl_qualifiers {
struct ccl_qualifier *q;
struct ccl_rpn_attr **attrp;
- assert (b);
+ ccl_assert (b);
for (q = b->list; q; q = q->next)
if (!strcmp (name, q->name))
break;
if (!q)
{
- struct ccl_qualifier *new_qual = (struct ccl_qualifier *)malloc (sizeof(*new_qual));
- assert (new_qual);
+ struct ccl_qualifier *new_qual =
+ (struct ccl_qualifier *)malloc (sizeof(*new_qual));
+ ccl_assert (new_qual);
new_qual->next = b->list;
b->list = new_qual;
new_qual->name = (char *)malloc (strlen(name)+1);
- assert (new_qual->name);
+ ccl_assert (new_qual->name);
strcpy (new_qual->name, name);
attrp = &new_qual->attr_list;
}
struct ccl_rpn_attr *attr;
attr = (struct ccl_rpn_attr *)malloc (sizeof(*attr));
- assert (attr);
+ ccl_assert (attr);
attr->type = *pairs++;
attr->value = *pairs++;
*attrp = attr;
CCL_bibset ccl_qual_mk (void)
{
CCL_bibset b = (CCL_bibset)malloc (sizeof(*b));
- assert (b);
+ ccl_assert (b);
b->list = NULL;
return b;
}
free (attr);
}
q1 = q->next;
+ free (q->name);
free (q);
}
free (*b);
{
struct ccl_qualifier *q;
- assert (cclp);
+ ccl_assert (cclp);
if (!cclp->bibset)
return NULL;
for (q = cclp->bibset->list; q; q = q->next)
if (strlen(q->name) == len)
+ {
if (cclp->ccl_case_sensitive)
{
if (!memcmp (name, q->name, len))
if (!ccl_memicmp (name, q->name, len))
return q->attr_list;
}
+ }
return NULL;
}