Removed prefix Yaz_ from several class - and interface names now

[yazpp-moved-to-github.git] / zoom / zconn.cpp

diff --git a/zoom/zconn.cpp b/zoom/zconn.cpp
index e6f9dc9..4edb20c 100644 (file)
--- a/zoom/zconn.cpp
+++ b/zoom/zconn.cpp
@@ -1,31 +1,46 @@
-// $Header: /home/cvsroot/yaz++/zoom/zconn.cpp,v 1.1 2002-08-08 13:31:54 mike Exp $
+// $Header: /home/cvsroot/yaz++/zoom/zconn.cpp,v 1.8 2005-05-03 16:29:52 mike Exp $
 
 // Z39.50 Connection class
 
-#include "zoom++.h"
+#include "zoom.h"
 
 
 namespace ZOOM {
-    connection::connection(const char *hostname, int portnum) {
-       c = ZOOM_connection_new(hostname, portnum);
+    connection::connection() {
+       ZOOM_options o = ZOOM_options_create();
+       c = ZOOM_connection_create(o);
+    }
+
+    void connection::connect(const std::string &hostname, int portnum) {
+       const char *line_printer_size_hostname = hostname.c_str();
+       //###cerr << "opening " << hostname << ":" << portnum << "\n";
+       ZOOM_connection_connect(c, line_printer_size_hostname, portnum);
+       //###cerr << "opened\n";
 
        int errcode;
        const char *errmsg;     // unused: carries same info as `errcode'
        const char *addinfo;
        if ((errcode = ZOOM_connection_error(c, &errmsg, &addinfo)) != 0) {
-           throw bib1Error(errcode, addinfo);
+           //###cerr << "oops: no connect, errcode=" << errcode << "\n";
+           throw bib1Exception(errcode, addinfo);
        }
     }
 
-    const char *connection::option(const char *key) const {
-       return ZOOM_connection_option_get(c, key);
+    connection::connection(const std::string &hostname, int portnum) {
+       ZOOM_options o = ZOOM_options_create();
+       c = ZOOM_connection_create(o);
+       connect(hostname, portnum);
+    }
+
+    std::string connection::option(const std::string &key) const {
+       const char* val = ZOOM_connection_option_get(c, key.c_str());
+       return (val) ? val : std::string();
     }
 
-    const char *connection::option(const char *key, const char *val) {
-       // ### There may be memory-management issues here.
-       const char *old = ZOOM_connection_option_get(c, key);
-       ZOOM_connection_option_set(c, key, val);
-       return old;
+    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;
     }
 
     connection::~connection() {