cql_transform_rpn2cql_stream back to error in cql_transform_t

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

diff --git a/src/rpn2cql.c b/src/rpn2cql.c
index 8a09212..7763db3 100644 (file)
--- a/src/rpn2cql.c
+++ b/src/rpn2cql.c
@@ -20,11 +20,6 @@
 #include <yaz/wrbuf.h>
 #include <yaz/logrpn.h> /* For yaz_prox_unit_name() */
 
-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;
@@ -348,6 +343,8 @@ int cql_transform_rpn2cql_stream(cql_transform_t ct,
     int r;
     WRBUF w = wrbuf_alloc();
     r = rpn2cql_structure(ct, pr, client_data, q->RPNStructure, 0, w);
+    if (r)
+        cql_transform_set_error(ct, r, 0);
     wrbuf_destroy(w);
     return r;
 }
@@ -357,7 +354,7 @@ int cql_transform_rpn2cql_wrbuf(cql_transform_t ct,
                                 WRBUF w,
                                 Z_RPNQuery *q)
 {
-    return cql_transform_rpn2cql_stream(ct, wrbuf_vputs, w, q);
+    return cql_transform_rpn2cql_stream(ct, wrbuf_vp_puts, w, q);
 }
 
 /*