/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
*/
/**
#include <yaz/diagbib1.h>
#include <yaz/z-core.h>
#include <yaz/wrbuf.h>
+#include <yaz/logrpn.h> /* For yaz_prox_unit_name() */
static void wrbuf_vputs(const char *buf, void *client_data)
{
Z_Term *term = apt->term;
const char *sterm = 0;
size_t lterm = 0;
+ Odr_int trunc = lookup_truncation(apt->attributes);
+ size_t i;
wrbuf_rewind(w);
ret = rpn2cql_attr(ct, apt->attributes, w);
- 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 -1;
}
- 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)
- {
- cql_transform_set_error(
- ct, YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE, 0);
- ret = -1;
- }
for (i = 0 ; i < lterm; i++)
- if (sterm[i] == ' ')
- must_quote = 1;
- if (must_quote)
- wrbuf_puts(w, "\"");
+ if (strchr(" ()=></", sterm[i]))
+ break;
+ wrbuf_puts(w, "\"");
if (trunc == 2 || trunc == 3)
wrbuf_puts(w, "*");
- wrbuf_write(w, sterm, lterm);
+ 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)
- wrbuf_puts(w, "\"");
+ wrbuf_puts(w, "\"");
+ }
+ else
+ {
+ cql_transform_set_error(
+ ct, YAZ_BIB1_UNSUPP_TRUNCATION_ATTRIBUTE, 0);
+ ret = -1;
}
if (ret == 0)
pr(wrbuf_cstr(w), client_data);
else
{
Z_Operator *op = q->u.complex->roperator;
+ Z_ProximityOperator *prox;
int r;
if (nested)
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) {
+ 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)