/*
- * Copyright (c) 1996-1999, Index Data.
+ * Copyright (c) 1996-2000, Index Data.
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: yaz-ccl.c,v $
- * Revision 1.4 1999-12-20 15:20:13 adam
+ * Revision 1.6 2000-02-02 15:13:23 adam
+ * Minor change.
+ *
+ * Revision 1.5 2000/01/31 13:15:22 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.4 1999/12/20 15:20:13 adam
* Implemented ccl_pquery to convert from CCL tree to prefix query.
*
* Revision 1.3 1999/11/30 13:47:12 adam
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <assert.h>
#include <yaz/yaz-ccl.h>
Z_AttributeElement **elements;
zapt = (Z_AttributesPlusTerm *)odr_malloc (o, sizeof(*zapt));
- assert (zapt);
term_octet = (Odr_oct *)odr_malloc (o, sizeof(*term_octet));
- assert (term_octet);
term = (Z_Term *)odr_malloc (o, sizeof(*term));
- assert(term);
for (attr = p->u.t.attr_list; attr; attr = attr->next)
num++;
{
elements[i] = (Z_AttributeElement *)
odr_malloc (o, sizeof(**elements));
- assert (elements[i]);
elements[i]->attributeType =
(int *)odr_malloc(o, sizeof(int));
*elements[i]->attributeType = attr->type;
Z_Operand *zo;
zo = (Z_Operand *)odr_malloc (o, sizeof(*zo));
- assert (zo);
switch (p->kind)
{
zo->u.resultSetId = p->u.setname;
break;
default:
- assert (0);
+ return 0;
}
return zo;
}
Z_Operator *zo;
zc = (Z_Complex *)odr_malloc (o, sizeof(*zc));
- assert (zc);
zo = (Z_Operator *)odr_malloc (o, sizeof(*zo));
- assert (zo);
zc->roperator = zo;
switch (p->kind)
#endif
break;
default:
- assert (0);
+ return 0;
}
zc->s1 = ccl_rpn_structure (o, p->u.p[0]);
zc->s2 = ccl_rpn_structure (o, p->u.p[1]);
Z_RPNStructure *zs;
zs = (Z_RPNStructure *)odr_malloc (o, sizeof(*zs));
- assert (zs);
switch (p->kind)
{
case CCL_RPN_AND:
zs->u.simple = ccl_rpn_simple (o, p);
break;
default:
- assert (0);
+ return 0;
}
return zs;
}
Z_RPNQuery *zq;
zq = (Z_RPNQuery *)odr_malloc (o, sizeof(*zq));
- assert (zq);
zq->attributeSetId = NULL;
zq->RPNStructure = ccl_rpn_structure (o, p);
return zq;
wrbuf_puts(w, "@prox 0 2 0 1 known 2 ");
break;
default:
- assert(0);
+ wrbuf_puts(w, "@ bad op (unknown) ");
};
ccl_pquery(w, p->u.p[0]);
ccl_pquery(w, p->u.p[1]);
wrbuf_puts (w, p->u.t.term);
wrbuf_puts (w, "} ");
break;
- default:
- assert (0);
- };
+ }
}