Comment fixes only

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

diff --git a/src/rpn2cql.c b/src/rpn2cql.c
index cea9f44..5530d01 100644 (file)
--- a/src/rpn2cql.c
+++ b/src/rpn2cql.c
@@ -18,19 +18,122 @@
 #include <yaz/z-core.h>
 #include <yaz/wrbuf.h>
 
+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;
+    int server_choice = 1;
+    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 not supported in CQL ?*/
+                        return 0; 
+                otherwise: 
+                        /* Invalid relation */
+                        return 0;
+                }
+
+            }
+            else {
+                /* Can we have a complex relation value? 
+                   Should we implement something? 
+                 */
+            }
+                
+            server_choice = 0; /* Which ServerChoice if relation? */
+        }
+    }
+    if (server_choice)
+        return "cql.serverChoice";
+    return 0;
+}
+
 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"))
@@ -39,6 +142,7 @@ static int rpn2cql_attr(cql_transform_t ct,
                 relation = "<=";
             else if (!strcmp(relation, "ge"))
                 relation = ">=";
+            /* Missing mapping of not equal, phonetic, stem and relevance */
             wrbuf_puts(w, relation);
         }
         else
@@ -46,7 +150,6 @@ static int rpn2cql_attr(cql_transform_t ct,
 
         if (structure)
         {
-            structure += 10;
             if (strcmp(structure, "*"))
             {
                 wrbuf_puts(w, "/");
@@ -86,7 +189,7 @@ static int rpn2cql_simple(cql_transform_t ct,
             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;
@@ -181,6 +284,7 @@ int cql_transform_rpn2cql_wrbuf(cql_transform_t ct,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab