Smaller example GFS. Added match-str.h for string match functions.

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

diff --git a/src/cqltransform.c b/src/cqltransform.c
index dbdd8aa..ea41036 100644 (file)
--- a/src/cqltransform.c
+++ b/src/cqltransform.c
@@ -22,12 +22,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <yaz/cql.h>
+#include <yaz/rpn2cql.h>
 #include <yaz/xmalloc.h>
 #include <yaz/diagsrw.h>
 #include <yaz/tokenizer.h>
 #include <yaz/wrbuf.h>
 #include <yaz/z-core.h>
+#include <yaz/match-str.h>
 #include <yaz/oid_db.h>
 #include <yaz/log.h>
 
@@ -78,7 +79,7 @@ static int cql_transform_parse_tok_line(cql_transform_t ct,
         const char *value_str = 0;
         /* attset type=value  OR  type=value */
         
-        elem = nmem_malloc(ct->nmem, sizeof(*elem));
+        elem = (Z_AttributeElement *) nmem_malloc(ct->nmem, sizeof(*elem));
         elem->attributeSet = 0;
         ae[ae_num] = elem;
         wrbuf_puts(ct->w, yaz_tok_parse_string(tp));
@@ -143,7 +144,8 @@ static int cql_transform_parse_tok_line(cql_transform_t ct,
         }
         else
         {
-            Z_ComplexAttribute *ca = nmem_malloc(ct->nmem, sizeof(*ca));
+            Z_ComplexAttribute *ca = (Z_ComplexAttribute *)
+                nmem_malloc(ct->nmem, sizeof(*ca));
             elem->which = Z_AttributeValue_complex;
             elem->value.complex = ca;
             ca->num_list = 1;
@@ -176,7 +178,7 @@ static int cql_transform_parse_tok_line(cql_transform_t ct,
             (*pp)->attr_list.attributes = 0;
         else
         {
-            (*pp)->attr_list.attributes =
+            (*pp)->attr_list.attributes = (Z_AttributeElement **)
                 nmem_malloc(ct->nmem,
                             ae_num * sizeof(Z_AttributeElement *));
             memcpy((*pp)->attr_list.attributes, ae,