X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Frpn2cql.c;h=7763db3eaed57a98831ebf2a71b572ed6e3d2d9b;hp=03963f437224e8fdf302255df16827f8fabd1fe5;hb=4f411c0f26882f2a4e91010ae901815b2bb245dc;hpb=e1f778342e0563a5cf8e5ca34d5be264afa1340e diff --git a/src/rpn2cql.c b/src/rpn2cql.c index 03963f4..7763db3 100644 --- a/src/rpn2cql.c +++ b/src/rpn2cql.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ /** @@ -20,11 +20,6 @@ #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) { int j; @@ -69,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; @@ -117,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")) { @@ -173,30 +164,31 @@ static Odr_int lookup_truncation(Z_AttributeList *attributes) } /* No truncation specified */ return 0; -}; +} 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; @@ -210,26 +202,21 @@ 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; - Odr_int trunc = lookup_truncation(apt->attributes); - - if (trunc > 3 && trunc != 100 && trunc != 102) - { - cql_transform_set_error( - ct, YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE, 0); - ret = -1; - } + int quote_it = 0; for (i = 0 ; i < lterm; i++) if (strchr(" ()=>u.complex->roperator; + Z_ProximityOperator *prox; int r; if (nested) @@ -288,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); @@ -301,7 +296,7 @@ static int rpn2cql_structure(cql_transform_t ct, break; case Z_Operator_prox: { pr(" prox", client_data); - Z_ProximityOperator *prox = op->u.prox; + 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 */ @@ -309,10 +304,9 @@ 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) + { + return YAZ_BIB1_UNSUPP_SEARCH; } pr(op2name[*prox->relationType-1], client_data); sprintf(buf, "%ld", (long) *prox->distance); @@ -348,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; } @@ -359,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); } /*