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

[yazpp-moved-to-github.git] / src / yaz-z-query.cpp

diff --git a/src/yaz-z-query.cpp b/src/yaz-z-query.cpp
index 8d391d5..641934c 100644 (file)
--- a/src/yaz-z-query.cpp
+++ b/src/yaz-z-query.cpp
@@ -2,12 +2,14 @@
  * Copyright (c) 1998-2003, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-query.cpp,v 1.13 2003-10-03 13:01:42 adam Exp $
+ * $Id: yaz-z-query.cpp,v 1.16 2005-06-02 06:40:21 adam Exp $
  */
 
 #include <yaz++/z-query.h>
 #include <yaz/pquery.h>
 
+using namespace yazpp_1;
+
 Yaz_Z_Query::Yaz_Z_Query()
 {
     odr_encode = odr_createmem (ODR_ENCODE);
@@ -78,9 +80,9 @@ void Yaz_Z_Query::print(char *str, int len)
        }
        else
            strcpy(str, wrbuf_buf(wbuf));
+       wrbuf_free(wbuf,1);
     }
     odr_reset(odr_decode);
-    wrbuf_free(wbuf,1);
 }
 
 int Yaz_Z_Query::match(Yaz_Z_Query *other)
@@ -179,10 +181,9 @@ int Yaz_Z_Query::rpn2pquery(Z_RPNStructure *s, WRBUF buf)
 
 WRBUF Yaz_Z_Query::zquery2pquery(Z_Query *q)
 {
-    WRBUF buf = wrbuf_alloc();
-
     if (q->which != Z_Query_type_1 && q->which != Z_Query_type_101) 
        return 0;
+    WRBUF buf = wrbuf_alloc();
     if (q->u.type_1->attributeSetId) {
        /* Output attribute set ID */
        wrbuf_puts(buf, "@attrset ");