Introducing namespace yazpp_1 for all YAZ++ functions. This will

[yazpp-moved-to-github.git] / include / yaz++ / z-query.h

diff --git a/include/yaz++/z-query.h b/include/yaz++/z-query.h
index ddc092d..31fcaa9 100644 (file)
--- a/include/yaz++/z-query.h
+++ b/include/yaz++/z-query.h
@@ -2,12 +2,13 @@
  * Copyright (c) 1998-2000, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: z-query.h,v 1.1 2002-10-09 12:50:26 adam Exp $
+ * $Id: z-query.h,v 1.4 2005-06-02 06:40:21 adam Exp $
  */
 
 #include <yaz/proto.h>
 #include <yaz++/query.h>
 
+namespace yazpp_1 {
 /** Z39.50 Query
     RPN, etc.
 */
@@ -28,9 +29,14 @@ class YAZ_EXPORT Yaz_Z_Query : public Yaz_Query {
     /// match query
     int match(Yaz_Z_Query *other);
  private:
-    char *buf;
-    int len;
+    char *m_buf;
+    int m_len;
     ODR odr_decode;
     ODR odr_encode;
     ODR odr_print;
+    void oid2str(Odr_oid *o, WRBUF buf);
+    int rpn2pquery(Z_RPNStructure *s, WRBUF buf);
+    WRBUF zquery2pquery(Z_Query *q);
+    void pr_term(WRBUF wbuf, char *buf, int len);
+};
 };