/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2011 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/z-core.h>
#include <yaz/wrbuf.h>
+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;
+ int server_choice = 1;
+ for (j = 0; j < attributes->num_attributes; j++)
+ {
+ Z_AttributeElement *ae = attributes->attributes[j];
+ if (*ae->attributeType == 1) /* use attribute */
+ {
+ if (ae->which == Z_AttributeValue_complex)
+ {
+ Z_ComplexAttribute *ca = ae->value.complex;
+ int i;
+ for (i = 0; i < ca->num_list; i++)
+ {
+ Z_StringOrNumeric *son = ca->list[i];
+ if (son->which == Z_StringOrNumeric_string)
+ return son->u.string;
+ }
+ }
+ server_choice = 0; /* not serverChoice because we have use attr */
+ }
+ }
+ if (server_choice)
+ return "cql.serverChoice";
+ return 0;
+}
+
+static const char *lookup_relation_index_from_attr(Z_AttributeList *attributes)
+{
+ int j;
+ for (j = 0; j < attributes->num_attributes; j++)
+ {
+ Z_AttributeElement *ae = attributes->attributes[j];
+ if (*ae->attributeType == 2) /* relation attribute */
+ {
+ if (ae->which == Z_AttributeValue_numeric)
+ {
+ /* Only support for numeric relation */
+ Odr_int *relation = ae->value.numeric;
+ /* map this numeric to representation in CQL */
+ switch (*relation)
+ {
+ /* Unsure on whether this is the relation attribute constants? */
+ 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:
+ /* phonetic is not supported in CQL */
+ return 0;
+ case 101:
+ /* stem is not supported in CQL */
+ return 0;
+ case 102:
+ /* relevance is supported in CQL, but not implemented yet */
+ return 0;
+ default:
+ /* Invalid relation */
+ return 0;
+ }
+ }
+ else {
+ /* Can we have a complex relation value?
+ Should we implement something?
+ */
+ }
+ }
+ }
+ return "=";
+}
+
static int rpn2cql_attr(cql_transform_t ct,
Z_AttributeList *attributes, WRBUF w)
{
const char *relation = cql_lookup_reverse(ct, "relation.", attributes);
const char *index = cql_lookup_reverse(ct, "index.", attributes);
const char *structure = cql_lookup_reverse(ct, "structure.", attributes);
- if (index && strcmp(index, "index.cql.serverChoice"))
+
+ /* if transform (properties) do not match, we'll just use a USE string attribute (bug #2978) */
+ if (!index)
+ index = lookup_index_from_string_attr(attributes);
+
+ /* Attempt to fix bug #2978: Look for a relation attribute */
+ if (!relation)
+ relation = lookup_relation_index_from_attr(attributes);
+
+ if (!index)
{
- wrbuf_puts(w, index+6);
+ 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"))
+ {
+ wrbuf_puts(w, index);
if (relation)
{
- relation += 9;
-
if (!strcmp(relation, "exact"))
relation = "==";
else if (!strcmp(relation, "eq"))
relation = "<=";
else if (!strcmp(relation, "ge"))
relation = ">=";
+ /* Missing mapping of not equal, phonetic, stem and relevance */
wrbuf_puts(w, relation);
}
else
if (structure)
{
- structure += 10;
if (strcmp(structure, "*"))
{
wrbuf_puts(w, "/");
return 0;
}
+/* Bug 2878: Currently only support left and right truncation. Specific check for this */
+static int checkForTruncation(int flag, Z_AttributeList *attributes)
+{
+ int j;
+ for (j = 0; j < attributes->num_attributes; j++)
+ {
+ Z_AttributeElement *ae = attributes->attributes[j];
+ if (*ae->attributeType == 5) /* truncation attribute */
+ {
+ if (ae->which == Z_AttributeValue_numeric)
+ {
+ Odr_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 */
+ }
+ }
+ /* No truncation or unsupported */
+ return 0;
+};
+
+static int checkForLeftTruncation(Z_AttributeList *attributes) {
+ return checkForTruncation(2, attributes);
+}
+
+static int checkForRightTruncation(Z_AttributeList *attributes) {
+ return checkForTruncation(1, attributes);
+};
+
static int rpn2cql_simple(cql_transform_t ct,
void (*pr)(const char *buf, void *client_data),
void *client_data,
sterm = (const char *) term->u.general->buf;
break;
case Z_Term_numeric:
- wrbuf_printf(w, "%d", *term->u.numeric);
+ wrbuf_printf(w, ODR_INT_PRINTF, *term->u.numeric);
break;
case Z_Term_characterString:
sterm = term->u.characterString;
must_quote = 1;
if (must_quote)
wrbuf_puts(w, "\"");
+ /* Bug 2878: Check and add Truncation */
+ if (checkForLeftTruncation(apt->attributes))
+ wrbuf_puts(w, "*");
wrbuf_write(w, sterm, lterm);
+ /* Bug 2878: Check and add Truncation */
+ if (checkForRightTruncation(apt->attributes))
+ wrbuf_puts(w, "*");
if (must_quote)
wrbuf_puts(w, "\"");
}
return ret;
}
+
static int rpn2cql_structure(cql_transform_t ct,
void (*pr)(const char *buf, void *client_data),
void *client_data,
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
projects / yaz-moved-to-github.git / blobdiff