/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
#include <yaz/wrbuf.h>
#include <yaz/logrpn.h> /* 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;
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;
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"))
{
}
/* 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;
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(" ()=></", sterm[i]))
- must_quote = 1;
- if (must_quote)
+ {
+ quote_it = 1;
+ break;
+ }
+ if (lterm == 0)
+ quote_it = 1;
+ if (quote_it)
wrbuf_puts(w, "\"");
if (trunc == 2 || trunc == 3)
wrbuf_puts(w, "*");
if (sterm[i] == '\\' && i < lterm - 1)
{
i++;
- if (strchr("*?\"", sterm[i]))
+ if (strchr("*?\"\\", sterm[i]))
wrbuf_putc(w, '\\');
wrbuf_putc(w, sterm[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, '\\');
}
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;
}
else
{
Z_Operator *op = q->u.complex->roperator;
+ Z_ProximityOperator *prox;
int r;
if (nested)
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);
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 */
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);
{
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;
}
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);
}
/*
projects / yaz-moved-to-github.git / blobdiff