X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zoom%2Fzquery.cpp;h=704a20fda89f09631423f65affb0083cf6b4a9b1;hb=6d00ed0733857815bfe3eb2779b99bdd3f2049fe;hp=77c0d938863f52866fea2dd2a9970ed0a3c654ad;hpb=8e0f7888835eb1a84882b440209ec125ce5856c1;p=yazpp-moved-to-github.git

diff --git a/zoom/zquery.cpp b/zoom/zquery.cpp
index 77c0d93..704a20f 100644
--- a/zoom/zquery.cpp
+++ b/zoom/zquery.cpp
@@ -1,24 +1,22 @@
-// $Header: /home/cvsroot/yaz++/zoom/zquery.cpp,v 1.1 2002-08-08 13:31:54 mike Exp $
-
 // Z39.50 Query classes
 
-#include "zoom++.h"
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "zoom.h"
 
 
 namespace ZOOM {
+    query::query() : q(ZOOM_query_create()) {
+    }
     query::~query() {
-	ZOOM_query_destroy(q);
-	q = 0;
+        ZOOM_query_destroy(q);
     }
 
-
-
-    prefixQuery::prefixQuery(const char *pqn) {
-	q = ZOOM_query_create();
-	if (ZOOM_query_prefix(q, pqn) == -1) {
-	    ZOOM_query_destroy(q);
-	    throw queryError(queryError::PREFIX, pqn);
-	}
+    prefixQuery::prefixQuery(const std::string &pqn) {
+        if (ZOOM_query_prefix(q, pqn.c_str()) == -1) {
+            throw queryException(queryException::PREFIX, pqn);
+        }
     }
 
     // The binding specification says we have to have destructors for
@@ -37,18 +35,23 @@ 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) {
-	throw "Oops.  No CCL support in ZOOM-C yet.  Sorry.";
+    CCLQuery::CCLQuery(const std::string &, void *) {
+        throw "Oops.  No CCL support in ZOOM-C yet.  Sorry.";
     }
 
     CCLQuery::~CCLQuery() {
-	ZOOM_query_destroy(q);
-	q = 0;
     }
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+