X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fzconn.cpp;h=3b3137a40397effc8f56c87fc5346d9df5a05ef1;hp=d5d4c85ac8d6e75e628fd153ac70e5f530894636;hb=d84b43231c7c5b0786e9aa62d0f7ca7ecd83bdb5;hpb=88e190489a5c483e5b860048aeebde41bf262962

diff --git a/zoom/zconn.cpp b/zoom/zconn.cpp
index d5d4c85..3b3137a 100644
--- a/zoom/zconn.cpp
+++ b/zoom/zconn.cpp
@@ -1,4 +1,4 @@
-// $Header: /home/cvsroot/yaz++/zoom/zconn.cpp,v 1.4 2002-11-30 22:33:21 mike Exp $
+// $Header: /home/cvsroot/yaz++/zoom/zconn.cpp,v 1.6 2003-09-22 12:25:20 mike Exp $
 
 // Z39.50 Connection class
 
@@ -6,7 +6,7 @@
 
 
 namespace ZOOM {
-    connection::connection(const string &hostname, int portnum) {
+    connection::connection(const std::string &hostname, int portnum) {
 	const char *line_printer_size_hostname = hostname.c_str();
 	//###cerr << "opening " << hostname << ":" << portnum << "\n";
 	c = ZOOM_connection_new(line_printer_size_hostname, portnum);
@@ -17,15 +17,16 @@ namespace ZOOM {
 	const char *addinfo;
 	if ((errcode = ZOOM_connection_error(c, &errmsg, &addinfo)) != 0) {
 	    //###cerr << "oops: no connect, errcode=" << errcode << "\n";
+	    ZOOM_connection_destroy(c);
 	    throw bib1Exception(errcode, addinfo);
 	}
     }
 
-    string connection::option(const string &key) const {
+    std::string connection::option(const std::string &key) const {
 	return ZOOM_connection_option_get(c, key.c_str());
     }
 
-    bool connection::option(const string &key, const string &val) {
+    bool connection::option(const std::string &key, const std::string &val) {
 	// No way to tell whether ZOOM_connection_option_set() accepts key
 	ZOOM_connection_option_set(c, key.c_str(), val.c_str());
 	return true;