rpn2cql_structure() supports proximity nodes (except that the Type-1

[yaz-moved-to-github.git] / src / rpn2cql.c

diff --git a/src/rpn2cql.c b/src/rpn2cql.c
index 68b359a..d892986 100644 (file)
--- a/src/rpn2cql.c
+++ b/src/rpn2cql.c
@@ -1,13 +1,14 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 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>
@@ -17,6 +18,7 @@
 #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)
 {
@@ -157,8 +159,7 @@ static int rpn2cql_attr(cql_transform_t ct,
     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++)
@@ -167,27 +168,13 @@ static int checkForTruncation(int flag, Z_AttributeList *attributes)
         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 */
+                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,
@@ -231,17 +218,23 @@ static int rpn2cql_simple(cql_transform_t ct,
         {
             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, "\"");
-            /* 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))
+            if (trunc == 1 || trunc == 3)
                 wrbuf_puts(w, "*");
             if (must_quote)
                 wrbuf_puts(w, "\"");
@@ -283,9 +276,40 @@ static int rpn2cql_structure(cql_transform_t ct,
         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);
+            Z_ProximityOperator *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)