X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Frpn2cql.c;h=7763db3eaed57a98831ebf2a71b572ed6e3d2d9b;hp=68b359af063d8f80ed9ad394121b117cc4ce9b2d;hb=4f411c0f26882f2a4e91010ae901815b2bb245dc;hpb=46767b31f38d6b9a1964319c5473c948dbb10c1d diff --git a/src/rpn2cql.c b/src/rpn2cql.c index 68b359a..7763db3 100644 --- a/src/rpn2cql.c +++ b/src/rpn2cql.c @@ -1,13 +1,14 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ - /** * \file * \brief Implements RPN to CQL conversion - * */ +#if HAVE_CONFIG_H +#include +#endif #include #include @@ -17,11 +18,7 @@ #include #include #include - -static void wrbuf_vputs(const char *buf, void *client_data) -{ - wrbuf_write((WRBUF) client_data, buf, strlen(buf)); -} +#include /* For yaz_prox_unit_name() */ static const char *lookup_index_from_string_attr(Z_AttributeList *attributes) { @@ -67,27 +64,27 @@ static const char *lookup_relation_index_from_attr(Z_AttributeList *attributes) switch (*relation) { /* Unsure on whether this is the relation attribute constants? */ - case Z_ProximityOperator_Prox_lessThan: + case Z_ProximityOperator_Prox_lessThan: return "<"; - case Z_ProximityOperator_Prox_lessThanOrEqual: - return "<="; - case Z_ProximityOperator_Prox_equal: - return "="; - case Z_ProximityOperator_Prox_greaterThanOrEqual: - return ">="; - case Z_ProximityOperator_Prox_greaterThan: - return ">"; - case Z_ProximityOperator_Prox_notEqual: - return "<>"; - case 100: + case Z_ProximityOperator_Prox_lessThanOrEqual: + return "<="; + case Z_ProximityOperator_Prox_equal: + return "="; + case Z_ProximityOperator_Prox_greaterThanOrEqual: + return ">="; + case Z_ProximityOperator_Prox_greaterThan: + return ">"; + case Z_ProximityOperator_Prox_notEqual: + return "<>"; + case 100: /* phonetic is not supported in CQL */ - return 0; - case 101: + return 0; + case 101: /* stem is not supported in CQL */ - return 0; - case 102: + return 0; + case 102: /* relevance is supported in CQL, but not implemented yet */ - return 0; + return 0; default: /* Invalid relation */ return 0; @@ -115,15 +112,11 @@ static int rpn2cql_attr(cql_transform_t ct, index = lookup_index_from_string_attr(attributes); /* Attempt to fix bug #2978: Look for a relation attribute */ - if (!relation) + if (!relation) relation = lookup_relation_index_from_attr(attributes); if (!index) - { - cql_transform_set_error(ct, - YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, 0); - return -1; - } + return YAZ_BIB1_UNSUPP_USE_ATTRIBUTE; /* for serverChoice we omit index+relation+structure */ if (strcmp(index, "cql.serverChoice")) { @@ -157,8 +150,7 @@ static int rpn2cql_attr(cql_transform_t ct, return 0; } -/* Bug 2878: Currently only support left and right truncation. Specific check for this */ -static int checkForTruncation(int flag, Z_AttributeList *attributes) +static Odr_int lookup_truncation(Z_AttributeList *attributes) { int j; for (j = 0; j < attributes->num_attributes; j++) @@ -167,49 +159,36 @@ static int checkForTruncation(int flag, Z_AttributeList *attributes) if (*ae->attributeType == 5) /* truncation attribute */ { if (ae->which == Z_AttributeValue_numeric) - { - Odr_int truncation = *(ae->value.numeric); - /* This logic only works for Left, right and both. eg. 1,2,3 */ - if (truncation <= 3) - return ((int) truncation & flag); - } - /* Complex: Shouldn't happen */ + return *(ae->value.numeric); } } - /* No truncation or unsupported */ + /* No truncation specified */ return 0; -}; - -static int checkForLeftTruncation(Z_AttributeList *attributes) { - return checkForTruncation(1, attributes); } -static int checkForRightTruncation(Z_AttributeList *attributes) { - return checkForTruncation(2, attributes); -}; - static int rpn2cql_simple(cql_transform_t ct, void (*pr)(const char *buf, void *client_data), void *client_data, Z_Operand *q, WRBUF w) { - int ret = 0; if (q->which != Z_Operand_APT) - { - ret = -1; - cql_transform_set_error(ct, YAZ_BIB1_RESULT_SET_UNSUPP_AS_A_SEARCH_TERM, 0); - } + return YAZ_BIB1_RESULT_SET_UNSUPP_AS_A_SEARCH_TERM; else { Z_AttributesPlusTerm *apt = q->u.attributesPlusTerm; Z_Term *term = apt->term; const char *sterm = 0; size_t lterm = 0; + Odr_int trunc = lookup_truncation(apt->attributes); + size_t i; + int r; wrbuf_rewind(w); - ret = rpn2cql_attr(ct, apt->attributes, w); + r = rpn2cql_attr(ct, apt->attributes, w); + if (r) + return r; - switch(term->which) + switch (term->which) { case Z_Term_general: lterm = term->u.general->len; @@ -223,33 +202,64 @@ static int rpn2cql_simple(cql_transform_t ct, lterm = strlen(sterm); break; default: - ret = -1; - cql_transform_set_error(ct, YAZ_BIB1_TERM_TYPE_UNSUPP, 0); + return YAZ_BIB1_TERM_TYPE_UNSUPP; } - if (term) + if (trunc <= 3 || trunc == 100 || trunc == 102 || trunc == 104) { - size_t i; - int must_quote = 0; + int quote_it = 0; for (i = 0 ; i < lterm; i++) - if (sterm[i] == ' ') - must_quote = 1; - if (must_quote) + if (strchr(" ()=>attributes)) + if (trunc == 2 || trunc == 3) wrbuf_puts(w, "*"); - wrbuf_write(w, sterm, lterm); - /* Bug 2878: Check and add Truncation */ - if (checkForRightTruncation(apt->attributes)) + for (i = 0; i < lterm; i++) + { + if (sterm[i] == '\\' && i < lterm - 1) + { + i++; + if (strchr("*?\"\\", sterm[i])) + wrbuf_putc(w, '\\'); + wrbuf_putc(w, sterm[i]); + } + else if (trunc == 102 && sterm[i] == '.' && sterm[i+1] == '*') + { + wrbuf_putc(w, '*'); + i++; + } + else if (trunc == 102 && sterm[i] == '.') + wrbuf_putc(w, '?'); + else if (trunc == 104 && sterm[i] == '?') + wrbuf_putc(w, '*'); + else if (trunc == 104 && sterm[i] == '#') + wrbuf_putc(w, '?'); + else if (strchr("*?\"", sterm[i])) + { + wrbuf_putc(w, '\\'); + wrbuf_putc(w, sterm[i]); + } + else + wrbuf_putc(w, sterm[i]); + } + if (trunc == 1 || trunc == 3) wrbuf_puts(w, "*"); - if (must_quote) + if (quote_it) wrbuf_puts(w, "\""); } - if (ret == 0) - pr(wrbuf_cstr(w), client_data); + else + { + return YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE; + } + pr(wrbuf_cstr(w), client_data); } - return ret; + return 0; } @@ -264,6 +274,7 @@ static int rpn2cql_structure(cql_transform_t ct, else { Z_Operator *op = q->u.complex->roperator; + Z_ProximityOperator *prox; int r; if (nested) @@ -272,7 +283,7 @@ static int rpn2cql_structure(cql_transform_t ct, r = rpn2cql_structure(ct, pr, client_data, q->u.complex->s1, 1, w); if (r) return r; - switch(op->which) + switch (op->which) { case Z_Operator_and: pr(" and ", client_data); @@ -283,9 +294,39 @@ 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); + 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) + { + return YAZ_BIB1_UNSUPP_SEARCH; + } + 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) @@ -301,8 +342,9 @@ int cql_transform_rpn2cql_stream(cql_transform_t ct, { int r; WRBUF w = wrbuf_alloc(); - cql_transform_set_error(ct, 0, 0); r = rpn2cql_structure(ct, pr, client_data, q->RPNStructure, 0, w); + if (r) + cql_transform_set_error(ct, r, 0); wrbuf_destroy(w); return r; } @@ -312,7 +354,7 @@ int cql_transform_rpn2cql_wrbuf(cql_transform_t ct, WRBUF w, Z_RPNQuery *q) { - return cql_transform_rpn2cql_stream(ct, wrbuf_vputs, w, q); + return cql_transform_rpn2cql_stream(ct, wrbuf_vp_puts, w, q); } /*