X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zutil%2Fyaz-ccl.c;h=45eeb371a6a76bb5a53deaa3ae14040619b517d3;hp=f0de394dae6634022d5455b197a078bf96e1f4e3;hb=65efc4dd0a947e1b4620d93c88d771b83bc32dac;hpb=01c57e6248b73d42453be75d5bceb6fa7ff8081d diff --git a/zutil/yaz-ccl.c b/zutil/yaz-ccl.c index f0de394..45eeb37 100644 --- a/zutil/yaz-ccl.c +++ b/zutil/yaz-ccl.c @@ -1,231 +1,132 @@ /* - * Copyright (c) 1996-1998, Index Data. + * Copyright (c) 1996-2002, Index Data. * See the file LICENSE for details. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: yaz-ccl.c,v $ - * Revision 1.2 1999-06-16 12:00:08 adam - * Added proximity. - * - * Revision 1.1 1999/06/08 10:12:43 adam - * Moved file to be part of zutil (instead of util). - * - * Revision 1.13 1998/03/31 15:13:20 adam - * Development towards compiled ASN.1. - * - * Revision 1.12 1998/02/11 11:53:36 adam - * Changed code so that it compiles as C++. - * - * Revision 1.11 1997/11/24 11:33:57 adam - * Using function odr_nullval() instead of global ODR_NULLVAL when - * appropriate. - * - * Revision 1.10 1997/09/29 08:58:25 adam - * Fixed conversion of trees so that true copy is made. - * - * Revision 1.9 1997/06/23 10:31:25 adam - * Added ODR argument to ccl_rpn_query and ccl_scan_query. - * - * Revision 1.8 1996/10/29 13:36:27 adam - * Added header. * + * $Id: yaz-ccl.c,v 1.16 2002-12-28 12:13:03 adam Exp $ */ #include #include #include -#include - -#include -static Z_RPNStructure *ccl_rpn_structure (ODR o, struct ccl_rpn_node *p); +#include +#include -static Z_AttributesPlusTerm *ccl_rpn_term (ODR o, struct ccl_rpn_node *p) +Z_RPNQuery *ccl_rpn_query (ODR o, struct ccl_rpn_node *p) { - struct ccl_rpn_attr *attr; - int num = 0; - Z_AttributesPlusTerm *zapt; - Odr_oct *term_octet; - Z_Term *term; - Z_AttributeElement **elements; + YAZ_PQF_Parser parser = yaz_pqf_create(); + WRBUF wr = wrbuf_alloc(); + Z_RPNQuery *q; - zapt = (Z_AttributesPlusTerm *)odr_malloc (o, sizeof(*zapt)); - assert (zapt); + ccl_pquery(wr, p); - term_octet = (Odr_oct *)odr_malloc (o, sizeof(*term_octet)); - assert (term_octet); + printf ("pqf=%s\n", wrbuf_buf(wr)); + q = yaz_pqf_parse(parser, o, wrbuf_buf(wr)); - term = (Z_Term *)odr_malloc (o, sizeof(*term)); - assert(term); - - for (attr = p->u.t.attr_list; attr; attr = attr->next) - num++; - if (!num) - elements = (Z_AttributeElement**)odr_nullval(); - else - { - int i = 0; - elements = (Z_AttributeElement **) - odr_malloc (o, num*sizeof(*elements)); - for (attr = p->u.t.attr_list; attr; attr = attr->next, i++) - { - 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; - elements[i]->attributeSet = 0; - elements[i]->which = Z_AttributeValue_numeric; - elements[i]->value.numeric = - (int *)odr_malloc (o, sizeof(int)); - *elements[i]->value.numeric = attr->value; - } - } -#ifdef ASN_COMPILED - zapt->attributes = (Z_AttributeList *) - odr_malloc (o, sizeof(*zapt->attributes)); - zapt->attributes->num_attributes = num; - zapt->attributes->attributes = elements; -#else - zapt->num_attributes = num; - zapt->attributeList = elements; -#endif - zapt->term = term; - term->which = Z_Term_general; - term->u.general = term_octet; - term_octet->len = term_octet->size = strlen (p->u.t.term); - term_octet->buf = (unsigned char *)odr_malloc (o, term_octet->len+1); - strcpy ((char*) term_octet->buf, p->u.t.term); - return zapt; + wrbuf_free(wr, 1); + yaz_pqf_destroy(parser); + return q; } -static Z_Operand *ccl_rpn_simple (ODR o, struct ccl_rpn_node *p) +Z_AttributesPlusTerm *ccl_scan_query (ODR o, struct ccl_rpn_node *p) { - Z_Operand *zo; + YAZ_PQF_Parser parser = yaz_pqf_create(); + WRBUF wr = wrbuf_alloc(); + Z_AttributesPlusTerm *q; + Odr_oid *setp; - zo = (Z_Operand *)odr_malloc (o, sizeof(*zo)); - assert (zo); + ccl_pquery(wr, p); - switch (p->kind) - { - case CCL_RPN_TERM: - zo->which = Z_Operand_APT; - zo->u.attributesPlusTerm = ccl_rpn_term (o, p); - break; - case CCL_RPN_SET: - zo->which = Z_Operand_resultSetId; - zo->u.resultSetId = p->u.setname; - break; - default: - assert (0); - } - return zo; + q = yaz_pqf_scan(parser, o, &setp, wrbuf_buf(wr)); + + wrbuf_free(wr, 1); + yaz_pqf_destroy(parser); + return q; } -static Z_Complex *ccl_rpn_complex (ODR o, struct ccl_rpn_node *p) +static void ccl_pquery_complex (WRBUF w, struct ccl_rpn_node *p) { - Z_Complex *zc; - 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) { case CCL_RPN_AND: - zo->which = Z_Operator_and; - zo->u.and = odr_nullval(); - break; + wrbuf_puts(w, "@and "); + break; case CCL_RPN_OR: - zo->which = Z_Operator_or; - zo->u.and = odr_nullval(); - break; + wrbuf_puts(w, "@or "); + break; case CCL_RPN_NOT: - zo->which = Z_Operator_and_not; - zo->u.and = odr_nullval(); - break; + wrbuf_puts(w, "@not "); + break; case CCL_RPN_PROX: - zo->which = Z_Operator_prox; - zo->u.prox = (Z_ProximityOperator *) - odr_malloc (o, sizeof(*zo->u.prox)); - zo->u.prox->exclusion = 0; - - zo->u.prox->distance = (int *) - odr_malloc (o, sizeof(*zo->u.prox->distance)); - *zo->u.prox->distance = 2; - - zo->u.prox->ordered = (bool_t *) - odr_malloc (o, sizeof(*zo->u.prox->ordered)); - *zo->u.prox->ordered = 0; - - zo->u.prox->relationType = (int *) - odr_malloc (o, sizeof(*zo->u.prox->relationType)); -#ifdef ASN_COMPILED - *zo->u.prox->relationType = Z_ProximityOperator_Prox_lessThan; - zo->u.prox->which = Z_ProximityOperator_known; - zo->u.prox->u.known = - odr_malloc (o, sizeof(*zo->u.prox->u.known)); - *zo->u.prox->u.known = Z_ProxUnit_word; -#else - *zo->u.prox->relationType = Z_Prox_lessThan; - zo->u.prox->which = Z_ProxCode_known; - zo->u.prox->proximityUnitCode = (int*) - odr_malloc (o, sizeof(*zo->u.prox->proximityUnitCode)); - *zo->u.prox->proximityUnitCode = Z_ProxUnit_word; -#endif + if (p->u.p[2] && p->u.p[2]->kind == CCL_RPN_TERM) + { + const char *cp = p->u.p[2]->u.t.term; + /* exlusion distance ordered relation which-code unit-code */ + if (*cp == '!') + { + /* word order specified */ + if (isdigit(cp[1])) + wrbuf_printf(w, "@prox 0 %s 1 2 k 2 ", cp+1); + else + wrbuf_printf(w, "@prox 0 1 1 2 k 2 "); + } + else if (*cp == '%') + { + /* word order not specified */ + if (isdigit(cp[1])) + wrbuf_printf(w, "@prox 0 %s 0 2 k 2 ", cp+1); + else + wrbuf_printf(w, "@prox 0 1 0 2 k 2 "); + } + } + else + wrbuf_puts(w, "@prox 0 2 0 1 k 2 "); break; default: - assert (0); - } - zc->s1 = ccl_rpn_structure (o, p->u.p[0]); - zc->s2 = ccl_rpn_structure (o, p->u.p[1]); - return zc; + wrbuf_puts(w, "@ bad op (unknown) "); + }; + ccl_pquery(w, p->u.p[0]); + ccl_pquery(w, p->u.p[1]); } - -static Z_RPNStructure *ccl_rpn_structure (ODR o, struct ccl_rpn_node *p) + +void ccl_pquery (WRBUF w, struct ccl_rpn_node *p) { - Z_RPNStructure *zs; + struct ccl_rpn_attr *att; + const char *cp; - zs = (Z_RPNStructure *)odr_malloc (o, sizeof(*zs)); - assert (zs); switch (p->kind) { case CCL_RPN_AND: case CCL_RPN_OR: case CCL_RPN_NOT: case CCL_RPN_PROX: - zs->which = Z_RPNStructure_complex; - zs->u.complex = ccl_rpn_complex (o, p); - break; - case CCL_RPN_TERM: + ccl_pquery_complex (w, p); + break; case CCL_RPN_SET: - zs->which = Z_RPNStructure_simple; - zs->u.simple = ccl_rpn_simple (o, p); - break; - default: - assert (0); + wrbuf_puts (w, "@set "); + wrbuf_puts (w, p->u.setname); + wrbuf_puts (w, " "); + break; + case CCL_RPN_TERM: + for (att = p->u.t.attr_list; att; att = att->next) + { + char tmpattr[128]; + wrbuf_puts (w, "@attr "); + if (att->set) + { + wrbuf_puts (w, att->set); + wrbuf_puts (w, " "); + } + sprintf(tmpattr, "%d=%d ", att->type, att->value); + wrbuf_puts (w, tmpattr); + } + for (cp = p->u.t.term; *cp; cp++) + { + if (*cp == ' ' || *cp == '\\') + wrbuf_putc (w, '\\'); + wrbuf_putc (w, *cp); + } + wrbuf_puts (w, " "); + break; } - return zs; -} - -Z_RPNQuery *ccl_rpn_query (ODR o, struct ccl_rpn_node *p) -{ - 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; -} - -Z_AttributesPlusTerm *ccl_scan_query (ODR o, struct ccl_rpn_node *p) -{ - if (p->kind != CCL_RPN_TERM) - return NULL; - return ccl_rpn_term (o, p); }