* Europagate, 1995
*
* $Log: cclqual.c,v $
- * Revision 1.5 1996-10-11 15:00:25 adam
+ * Revision 1.15 2001-03-07 13:24:40 adam
+ * Member and_not in Z_Operator is kept for backwards compatibility.
+ * Added support for definition of CCL operators in field spec file.
+ *
+ * Revision 1.14 2000/11/16 09:58:02 adam
+ * Implemented local AttributeSet setting for CCL field maps.
+ *
+ * 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
+ * Changed CCL parser to be thread safe. New type, CCL_parser, declared
+ * and a create/destructers ccl_parser_create/ccl_parser/destory has
+ * been added.
+ *
+ * Revision 1.7 1997/09/01 08:48:12 adam
+ * New windows NT/95 port using MSV5.0. Only a few changes made
+ * to avoid warnings.
+ *
+ * Revision 1.6 1997/04/30 08:52:07 quinn
+ * Null
+ *
+ * Revision 1.5 1996/10/11 15:00:25 adam
* CCL parser from Europagate Email gateway 1.0.
*
* Revision 1.9 1995/05/16 09:39:27 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 *list;
+ struct ccl_qualifier_special *special;
+};
+
+
+/* CCL Qualifier special */
+struct ccl_qualifier_special {
+ char *name;
+ char *value;
+ struct ccl_qualifier_special *next;
};
+void ccl_qual_add_special (CCL_bibset bibset, const char *n, const char *v)
+{
+ struct ccl_qualifier_special *p;
+ const char *pe;
+
+ for (p = bibset->special; p && strcmp(p->name, n); p = p->next)
+ ;
+ if (p)
+ free (p->value);
+ else
+ {
+ p = (struct ccl_qualifier_special *) malloc (sizeof(*p));
+ p->name = ccl_strdup (n);
+ p->value = 0;
+ p->next = bibset->special;
+ bibset->special = p;
+ }
+ while (strchr(" \t", *v))
+ ++v;
+ for (pe = v + strlen(v); pe != v; --pe)
+ if (!strchr(" \n\r\t", pe[-1]))
+ break;
+ p->value = (char*) malloc (pe - v + 1);
+ if (pe - v)
+ memcpy (p->value, v, pe - v);
+ p->value[pe - v] = '\0';
+}
+
+
/*
* ccl_qual_add: Add qualifier to Bibset. If qualifier already
* exists, then attributes are appendend to old
* 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 (CCL_bibset b, const char *name, int no, int *pairs)
+void ccl_qual_add_set (CCL_bibset b, const char *name, int no, int *pairs,
+ char **attsets)
{
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 = 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 = malloc (strlen(name)+1);
- assert (new_qual->name);
+ new_qual->name = (char *)malloc (strlen(name)+1);
+ ccl_assert (new_qual->name);
strcpy (new_qual->name, name);
attrp = &new_qual->attr_list;
}
{
struct ccl_rpn_attr *attr;
- attr = malloc (sizeof(*attr));
- assert (attr);
+ attr = (struct ccl_rpn_attr *)malloc (sizeof(*attr));
+ ccl_assert (attr);
+ attr->set = *attsets++;
attr->type = *pairs++;
attr->value = *pairs++;
*attrp = attr;
*/
CCL_bibset ccl_qual_mk (void)
{
- CCL_bibset b = malloc (sizeof(*b));
- assert (b);
+ CCL_bibset b = (CCL_bibset)malloc (sizeof(*b));
+ ccl_assert (b);
b->list = NULL;
+ b->special = NULL;
return b;
}
void ccl_qual_rm (CCL_bibset *b)
{
struct ccl_qualifier *q, *q1;
+ struct ccl_qualifier_special *sp, *sp1;
if (!*b)
return;
for (attr = q->attr_list; attr; attr = attr1)
{
attr1 = attr->next;
+ if (attr->set)
+ free (attr->set);
free (attr);
}
q1 = q->next;
+ free (q->name);
free (q);
}
+ for (sp = (*b)->special; sp; sp = sp1)
+ {
+ sp1 = sp->next;
+ free (sp->name);
+ free (sp->value);
+ free (sp);
+ }
free (*b);
*b = NULL;
}
* len: Length of name.
* return: Attribute info. NULL if not found.
*/
-struct ccl_rpn_attr *ccl_qual_search (CCL_bibset b, const char *name, int len)
+struct ccl_rpn_attr *ccl_qual_search (CCL_parser cclp,
+ const char *name, size_t len)
{
struct ccl_qualifier *q;
- assert (b);
- for (q = b->list; q; q = q->next)
+ ccl_assert (cclp);
+ if (!cclp->bibset)
+ return NULL;
+ for (q = cclp->bibset->list; q; q = q->next)
if (strlen(q->name) == len)
- if (ccl_case_sensitive)
+ {
+ if (cclp->ccl_case_sensitive)
{
if (!memcmp (name, q->name, len))
return q->attr_list;
if (!ccl_memicmp (name, q->name, len))
return q->attr_list;
}
+ }
return NULL;
}
+const char *ccl_qual_search_special (CCL_bibset b,
+ const char *name)
+{
+ struct ccl_qualifier_special *q;
+ if (!b)
+ return 0;
+ for (q = b->special; q && strcmp(q->name, name); q = q->next)
+ ;
+ if (q)
+ return q->value;
+ return 0;
+}
projects / yaz-moved-to-github.git / blobdiff