Change implementation of Yaz_Z_Query::zquery2pquery to use YAZ'

[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 3367769..33bda9e 100644 (file)
--- a/include/yaz++/z-query.h
+++ b/include/yaz++/z-query.h
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 1998-2000, Index Data.
+ * Copyright (c) 1998-2005, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: z-query.h,v 1.3 2003-10-03 13:01:42 adam Exp $
+ * $Id: z-query.h,v 1.6 2005-09-27 17:57:50 adam Exp $
  */
 
 #include <yaz/proto.h>
 #include <yaz++/query.h>
 
+namespace yazpp_1 {
 /** Z39.50 Query
     RPN, etc.
 */
@@ -27,14 +28,24 @@ class YAZ_EXPORT Yaz_Z_Query : public Yaz_Query {
     void print(char *str, int len);
     /// match query
     int match(Yaz_Z_Query *other);
+    /// Copy
+    Yaz_Z_Query &operator=(const Yaz_Z_Query &);
+    /// Assign RPN string to it
+    Yaz_Z_Query& Yaz_Z_Query::operator=(const char *rpn);
  private:
     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);
 };
+};
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+