X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zoom%2Fzquery.cpp;h=d2f699d2bb2386aa0238f878b48ffc8f3ed34e35;hb=a78a33783fe04e47932ad2c4a10e70659b0d15f4;hp=154e3ce18d65e72e52eba8ce0114d08240d44a3e;hpb=b8248fc2b2eb866a23a677135deb4633cb1f3322;p=yazpp-moved-to-github.git

diff --git a/zoom/zquery.cpp b/zoom/zquery.cpp
index 154e3ce..d2f699d 100644
--- a/zoom/zquery.cpp
+++ b/zoom/zquery.cpp
@@ -1,4 +1,4 @@
-// $Header: /home/cvsroot/yaz++/zoom/zquery.cpp,v 1.3 2002-10-09 09:07:10 mike Exp $
+// $Header: /home/cvsroot/yaz++/zoom/zquery.cpp,v 1.6 2003-09-22 13:01:54 mike Exp $
 
 // Z39.50 Query classes
 
@@ -6,17 +6,14 @@
 
 
 namespace ZOOM {
+    query::query() : q(ZOOM_query_create()) {
+    }
     query::~query() {
 	ZOOM_query_destroy(q);
-	q = 0;
     }
 
-
-
-    prefixQuery::prefixQuery(const char *pqn) {
-	q = ZOOM_query_create();
-	if (ZOOM_query_prefix(q, pqn) == -1) {
-	    ZOOM_query_destroy(q);
+    prefixQuery::prefixQuery(const std::string &pqn) {
+	if (ZOOM_query_prefix(q, pqn.c_str()) == -1) {
 	    throw queryException(queryException::PREFIX, pqn);
 	}
     }
@@ -37,18 +34,14 @@ namespace ZOOM {
     // zeroing what we free so that we get bitten if we're wrong.
     //
     prefixQuery::~prefixQuery() {
-	ZOOM_query_destroy(q);
-	q = 0;
     }
 
 
 
-    CCLQuery::CCLQuery(const char *ccl, void *qualset) {
+    CCLQuery::CCLQuery(const std::string &, void *) {
 	throw "Oops.  No CCL support in ZOOM-C yet.  Sorry.";
     }
 
     CCLQuery::~CCLQuery() {
-	ZOOM_query_destroy(q);
-	q = 0;
     }
 }