X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Frpn2cql.c;h=b09d6a448318c2dd9c1c4143aa249b08dd7e00fd;hp=cac867d79dc70587cf05628be00b302cb895f117;hb=323805b6779bcf1befdc7cdd7f10c23b06885e0d;hpb=951bf68e90a1f19fc5103c408b136bdb4242e67b diff --git a/src/rpn2cql.c b/src/rpn2cql.c index cac867d..b09d6a4 100644 --- a/src/rpn2cql.c +++ b/src/rpn2cql.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2013 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ /** @@ -20,12 +20,8 @@ #include #include /* For yaz_prox_unit_name() */ -static void wrbuf_vputs(const char *buf, void *client_data) -{ - wrbuf_write((WRBUF) client_data, buf, strlen(buf)); -} - -static const char *lookup_index_from_string_attr(Z_AttributeList *attributes) +static const char *lookup_index_from_string_attr(Z_AttributeList *attributes, + Odr_int *numeric_value) { int j; int server_choice = 1; @@ -45,6 +41,10 @@ static const char *lookup_index_from_string_attr(Z_AttributeList *attributes) return son->u.string; } } + else if (ae->which == Z_AttributeValue_numeric) + { + *numeric_value = *ae->value.numeric; + } server_choice = 0; /* not serverChoice because we have use attr */ } } @@ -112,48 +112,47 @@ static int rpn2cql_attr(cql_transform_t ct, const char *index = cql_lookup_reverse(ct, "index.", attributes); const char *structure = cql_lookup_reverse(ct, "structure.", attributes); - /* if transform (properties) do not match, we'll just use a USE string attribute (bug #2978) */ + /* if transform (properties) do not match, we'll fall back + to string or report numeric attribute error */ if (!index) - index = lookup_index_from_string_attr(attributes); - - /* Attempt to fix bug #2978: Look for a relation attribute */ + { + Odr_int use_attribute = -1; + index = lookup_index_from_string_attr(attributes, &use_attribute); + if (!index) + { + wrbuf_rewind(w); + if (use_attribute != -1) + wrbuf_printf(w, ODR_INT_PRINTF, use_attribute); + return YAZ_BIB1_UNSUPP_USE_ATTRIBUTE; + } + } if (!relation) relation = lookup_relation_index_from_attr(attributes); - if (!index) - { - cql_transform_set_error(ct, - YAZ_BIB1_UNSUPP_USE_ATTRIBUTE, 0); - return -1; - } - /* for serverChoice we omit index+relation+structure */ - if (strcmp(index, "cql.serverChoice")) + if (!relation) + relation = "="; + else if (!strcmp(relation, "exact")) + relation = "=="; + else if (!strcmp(relation, "eq")) + relation = "="; + else if (!strcmp(relation, "le")) + relation = "<="; + else if (!strcmp(relation, "ge")) + relation = ">="; + + if (strcmp(index, "cql.serverChoice") || strcmp(relation, "=") + || (structure && strcmp(structure, "*"))) { wrbuf_puts(w, index); - if (relation) - { - if (!strcmp(relation, "exact")) - relation = "=="; - else if (!strcmp(relation, "eq")) - relation = "="; - else if (!strcmp(relation, "le")) - relation = "<="; - else if (!strcmp(relation, "ge")) - relation = ">="; - /* Missing mapping of not equal, phonetic, stem and relevance */ - wrbuf_puts(w, relation); - } - else - wrbuf_puts(w, "="); + wrbuf_puts(w, " "); + wrbuf_puts(w, relation); + wrbuf_puts(w, " "); - if (structure) + if (structure && strcmp(structure, "*")) { - if (strcmp(structure, "*")) - { - wrbuf_puts(w, "/"); - wrbuf_puts(w, structure); - wrbuf_puts(w, " "); - } + wrbuf_puts(w, "/"); + wrbuf_puts(w, structure); + wrbuf_puts(w, " "); } } return 0; @@ -180,11 +179,10 @@ static int rpn2cql_simple(cql_transform_t ct, 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); + wrbuf_rewind(w); + return YAZ_BIB1_RESULT_SET_UNSUPP_AS_A_SEARCH_TERM; } else { @@ -194,9 +192,12 @@ static int rpn2cql_simple(cql_transform_t ct, 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) { @@ -212,8 +213,9 @@ static int rpn2cql_simple(cql_transform_t ct, lterm = strlen(sterm); break; default: - cql_transform_set_error(ct, YAZ_BIB1_TERM_TYPE_UNSUPP, 0); - return -1; + wrbuf_rewind(w); + wrbuf_printf(w, "%d", term->which); + return YAZ_BIB1_TERM_TYPE_UNSUPP; } if (trunc <= 3 || trunc == 100 || trunc == 102 || trunc == 104) @@ -266,14 +268,13 @@ static int rpn2cql_simple(cql_transform_t ct, } else { - cql_transform_set_error( - ct, YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE, 0); - ret = -1; + wrbuf_rewind(w); + wrbuf_printf(w, ODR_INT_PRINTF, trunc); + return YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE; } - if (ret == 0) - pr(wrbuf_cstr(w), client_data); + pr(wrbuf_cstr(w), client_data); } - return ret; + return 0; } @@ -297,7 +298,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); @@ -318,10 +319,10 @@ static int rpn2cql_structure(cql_transform_t ct, 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; + *prox->relationType > Z_ProximityOperator_Prox_notEqual) + { + wrbuf_rewind(w); + return YAZ_BIB1_UNSUPP_SEARCH; } pr(op2name[*prox->relationType-1], client_data); sprintf(buf, "%ld", (long) *prox->distance); @@ -350,15 +351,29 @@ static int rpn2cql_structure(cql_transform_t ct, } } +int cql_transform_rpn2cql_stream_r(cql_transform_t ct, + WRBUF addinfo, + void (*pr)(const char *buf, void *client_data), + void *client_data, + Z_RPNQuery *q) +{ + /* addinfo (w) is used for both addinfo and house-keeping ! */ + int r = rpn2cql_structure(ct, pr, client_data, q->RPNStructure, 0, addinfo); + if (!r) + wrbuf_rewind(addinfo); /* no additional info if no error */ + return r; +} + + int cql_transform_rpn2cql_stream(cql_transform_t ct, void (*pr)(const char *buf, void *client_data), void *client_data, Z_RPNQuery *q) { - int r; WRBUF w = wrbuf_alloc(); - cql_transform_set_error(ct, 0, 0); - r = rpn2cql_structure(ct, pr, client_data, q->RPNStructure, 0, w); + int r = cql_transform_rpn2cql_stream_r(ct, w, pr, client_data, q); + if (r) + cql_transform_set_error(ct, r, wrbuf_len(w) ? wrbuf_cstr(w) : 0); wrbuf_destroy(w); return r; } @@ -368,7 +383,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); } /*