/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
*/
-
/**
* \file
* \brief Implements RPN to CQL conversion
- *
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <assert.h>
#include <stdlib.h>
#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)
{
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)
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++)
if (*ae->attributeType == 5) /* truncation attribute */
{
if (ae->which == Z_AttributeValue_numeric)
- {
- 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_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;
+ int quote_it = 0;
for (i = 0 ; i < lterm; i++)
- if (sterm[i] == ' ')
- must_quote = 1;
- if (must_quote)
+ if (strchr(" ()=></", sterm[i]))
+ {
+ quote_it = 1;
+ break;
+ }
+ if (lterm == 0)
+ quote_it = 1;
+ if (quote_it)
wrbuf_puts(w, "\"");
- /* Bug 2878: Check and add Truncation */
- if (checkForLeftTruncation(apt->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, "\"");
}
+ 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)
projects / yaz-moved-to-github.git / blobdiff