Definition of wrbuf_diags moved to querytowrbuf.h. Function wrbuf_put_zquery

removed, because function yaz_query_to_wrbuf does the same.

diff --git a/NEWS b/NEWS
index e81f2b0..200cb5b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Definition of wrbuf_diags moved to querytowrbuf.h. Function wrbuf_put_zquery
+removed, because function yaz_query_to_wrbuf does the same.
+
 API changes to ZOOM. Functions for setting options returns int, rather
 than void, so we have a way to flag unknown options. ZOOM_resultset_sort1
 has become "the" ZOOM_resultset_sort. (and old ZOOM_resultset_sort is removed).

diff --git a/include/yaz/logrpn.h b/include/yaz/logrpn.h
index d641d1f..bad4498 100644 (file)
--- a/include/yaz/logrpn.h
+++ b/include/yaz/logrpn.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: logrpn.h,v 1.13 2007-01-03 08:42:14 adam Exp $ */
+/* $Id: logrpn.h,v 1.14 2007-03-19 21:07:35 adam Exp $ */
 
 /**
  * \file logrpn.h
@@ -36,7 +36,6 @@
 
 #include <yaz/yconfig.h>
 #include <yaz/proto.h>
-#include <yaz/wrbuf.h>
 
 YAZ_BEGIN_CDECL
 
@@ -50,9 +49,6 @@ YAZ_EXPORT void log_scan_term_level(int loglevel,
 YAZ_EXPORT void yaz_log_zquery(Z_Query *q);
 YAZ_EXPORT void yaz_log_zquery_level(int loglevel, Z_Query *q);
 
-YAZ_EXPORT void wrbuf_diags(WRBUF b, int num_diagnostics,Z_DiagRec **diags);
-YAZ_EXPORT void wrbuf_put_zquery(WRBUF b, const Z_Query *q);
-
 YAZ_END_CDECL
 
 #endif

diff --git a/include/yaz/querytowrbuf.h b/include/yaz/querytowrbuf.h
index 572ce88..bca4c4e 100644 (file)
--- a/include/yaz/querytowrbuf.h
+++ b/include/yaz/querytowrbuf.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: querytowrbuf.h,v 1.4 2007-01-03 08:42:14 adam Exp $ */
+/* $Id: querytowrbuf.h,v 1.5 2007-03-19 21:07:35 adam Exp $ */
 /**
  * \file querytowrbuf.h
  * \brief Query to WRBUF (to strings)
@@ -43,6 +43,7 @@ YAZ_EXPORT void yaz_query_to_wrbuf(WRBUF b, const Z_Query *q);
 YAZ_EXPORT void yaz_scan_to_wrbuf(WRBUF b, const Z_AttributesPlusTerm *zapt,
                                   oid_value ast);
 YAZ_EXPORT void yaz_rpnquery_to_wrbuf(WRBUF b, const Z_RPNQuery *rpn);
+YAZ_EXPORT void wrbuf_diags(WRBUF b, int num_diagnostics,Z_DiagRec **diags);
 
 YAZ_END_CDECL
 

diff --git a/src/querytowrbuf.c b/src/querytowrbuf.c
index 42192b1..51f01ad 100644 (file)
--- a/src/querytowrbuf.c
+++ b/src/querytowrbuf.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * All rights reserved.
  *
- * $Id: querytowrbuf.c,v 1.7 2007-03-19 14:40:07 adam Exp $
+ * $Id: querytowrbuf.c,v 1.8 2007-03-19 21:07:35 adam Exp $
  */
 
 /** \file querytowrbuf.c
@@ -228,21 +228,6 @@ void yaz_scan_to_wrbuf(WRBUF b, const Z_AttributesPlusTerm *zapt,
     yaz_apt_to_wrbuf(b, zapt);
 }
 
-/* obsolete */
-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);
-}
-
-
 /*
  * Local variables:
  * c-basic-offset: 4