From ea883a980a6b7c787a7f68d3e270d94630048666 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Wed, 24 Aug 2011 15:01:06 +0100 Subject: [PATCH] rpn2cql_structure() supports proximity nodes (except that the Type-1 proximity node's "exclusion" binary is ignored, as there is no way to express that in CQL). Fixes bug #4564. --- src/rpn2cql.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/src/rpn2cql.c b/src/rpn2cql.c index 8dc40f5..d892986 100644 --- a/src/rpn2cql.c +++ b/src/rpn2cql.c @@ -18,6 +18,7 @@ #include #include #include +#include /* For yaz_prox_unit_name() */ static void wrbuf_vputs(const char *buf, void *client_data) { @@ -275,9 +276,40 @@ static int rpn2cql_structure(cql_transform_t ct, case Z_Operator_and_not: pr(" not ", client_data); break; - case Z_Operator_prox: - cql_transform_set_error(ct, YAZ_BIB1_UNSUPP_SEARCH, 0); - return -1; + case Z_Operator_prox: { + pr(" prox", client_data); + Z_ProximityOperator *prox = op->u.prox; + /* No way to express Odr_bool *exclusion -- ignore it */ + if (prox->distance) { + char buf[21]; /* Enough for any 64-bit int */ + char *op2name[6] = { "<", "<=", "=", ">=", ">","<>" }; + pr("/distance", client_data); + if (!prox->relationType || + *prox->relationType < Z_ProximityOperator_Prox_lessThan || + *prox->relationType > Z_ProximityOperator_Prox_notEqual) { + cql_transform_set_error(ct, YAZ_BIB1_UNSUPP_SEARCH, + "unrecognised proximity relationType"); + return -1; + } + pr(op2name[*prox->relationType-1], client_data); + sprintf(buf, "%ld", (long) *prox->distance); + pr(buf, client_data); + } + if (prox->ordered) { + if (*prox->ordered) { + pr("/ordered", client_data); + } else { + pr("/unordered", client_data); + } + } + if (prox->which != Z_ProximityOperator_known || + *prox->u.known != Z_ProxUnit_word) { + pr("/unit=", client_data); + pr(yaz_prox_unit_name(prox), client_data); + } + pr(" ", client_data); + break; + } } r = rpn2cql_structure(ct, pr, client_data, q->u.complex->s2, 1, w); if (nested) -- 1.7.10.4