API changes to WRBUF. wrbuf_free removed; replaced by wrbuf_destroy. And

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

diff --git a/src/querytowrbuf.c b/src/querytowrbuf.c
index 50e32c4..42192b1 100644 (file)
--- a/src/querytowrbuf.c
+++ b/src/querytowrbuf.c
@@ -1,13 +1,12 @@
 /*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
  * All rights reserved.
  *
- * $Id: querytowrbuf.c,v 1.2 2006-01-20 11:01:46 adam Exp $
+ * $Id: querytowrbuf.c,v 1.7 2007-03-19 14:40:07 adam Exp $
  */
 
-/**
- * \file querytostr.c
- * \brief Query to WRBUF (to strings)
+/** \file querytowrbuf.c
+    \brief Query to WRBUF (to strings)
  */
 
 #include <stdio.h>
@@ -189,7 +188,7 @@ void yaz_rpnquery_to_wrbuf(WRBUF b, const Z_RPNQuery *rpn)
     if (attrset)
     {
         ast = attrset->value;
-        wrbuf_printf(b, " @attrset %s ", attrset->desc);
+        wrbuf_printf(b, "@attrset %s ", attrset->desc);
     } 
     yaz_rpnstructure_to_wrbuf(b, rpn->RPNStructure);
     wrbuf_chop_right(b);
@@ -203,21 +202,21 @@ void yaz_query_to_wrbuf(WRBUF b, const Z_Query *q)
     {
     case Z_Query_type_1: 
     case Z_Query_type_101:
-        wrbuf_printf(b,"RPN:");
+        wrbuf_printf(b,"RPN ");
         yaz_rpnquery_to_wrbuf(b, q->u.type_1);
         break;
     case Z_Query_type_2:
-        wrbuf_printf(b, "CCL: %.*s", q->u.type_2->len, q->u.type_2->buf);
+        wrbuf_printf(b, "CCL %.*s", q->u.type_2->len, q->u.type_2->buf);
         break;
     case Z_Query_type_100:
-        wrbuf_printf(b, "Z39.58: %.*s", q->u.type_100->len,
+        wrbuf_printf(b, "Z39.58 %.*s", q->u.type_100->len,
                      q->u.type_100->buf);
         break;
     case Z_Query_type_104:
         if (q->u.type_104->which == Z_External_CQL)
-            wrbuf_printf(b, "CQL: %s", q->u.type_104->u.cql);
+            wrbuf_printf(b, "CQL %s", q->u.type_104->u.cql);
         else
-            wrbuf_printf(b,"Unknown type 104 query %d", q->u.type_104->which);
+            wrbuf_printf(b,"UNKNOWN type 104 query %d", q->u.type_104->which);
     }
 }
 
@@ -225,6 +224,7 @@ void yaz_scan_to_wrbuf(WRBUF b, const Z_AttributesPlusTerm *zapt,
                        oid_value ast)
 {
     /* should print attr set here */
+    wrbuf_printf(b, "RPN ");
     yaz_apt_to_wrbuf(b, zapt);
 }
 
@@ -232,12 +232,14 @@ void yaz_scan_to_wrbuf(WRBUF b, const Z_AttributesPlusTerm *zapt,
 void wrbuf_scan_term(WRBUF b, const Z_AttributesPlusTerm *zapt, oid_value ast)
 {
     yaz_apt_to_wrbuf(b, zapt);
+    wrbuf_cstr(b);
 }
 
 /* obsolete */
 void wrbuf_put_zquery(WRBUF b, const Z_Query *q)
 {
     yaz_query_to_wrbuf(b, q);
+    wrbuf_cstr(b);
 }