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

[yazpp-moved-to-github.git] / src / yaz-my-client.cpp

diff --git a/src/yaz-my-client.cpp b/src/yaz-my-client.cpp
index 4ad8319..0f1cc7f 100644 (file)
--- a/src/yaz-my-client.cpp
+++ b/src/yaz-my-client.cpp
@@ -1,10 +1,11 @@
 /*
- * Copyright (c) 1998-2003, Index Data.
+ * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-my-client.cpp,v 1.13 2003-10-01 13:13:51 adam Exp $
+ * $Id: yaz-my-client.cpp,v 1.19 2005-06-02 06:40:21 adam Exp $
  */
 
+#include <stdlib.h>
 #include <yaz/log.h>
 #include <yaz/options.h>
 #include <yaz/diagbib1.h>
@@ -22,6 +23,8 @@ extern "C" {
 #endif
 }
 
+using namespace yazpp_1;
+
 class YAZ_EXPORT MyClient : public Yaz_IR_Assoc {
 private:
     int m_interactive_flag;
@@ -454,7 +457,7 @@ int MyClient::cmd_connect(char *host)
     client (host);
     timeout (10);
     wait ();
-    timeout (0);
+    timeout (-1);
     return 1;
 }
 
@@ -463,7 +466,7 @@ int MyClient::cmd_open(char *host)
     client (host);
     timeout (10);
     wait ();
-    timeout (0);
+    timeout (-1);
     send_initRequest();
     wait ();
     return 1;
@@ -542,9 +545,9 @@ int MyClient::processCommand(const char *commandLine)
     cmdArgs[0] = '\0';
     cmdStr[0] = '\0';
     static struct {
-        char *cmd;
+        const char *cmd;
         int (MyClient::*fun)(char *arg);
-        char *ad;
+        const char *ad;
     } cmd[] = {
        {"open", &MyClient::cmd_open, "<host>[':'<port>][/<database>]"},
        {"connect", &MyClient::cmd_connect, "<host>[':'<port>][/<database>]"},
@@ -676,7 +679,7 @@ int MyClient::args(Yaz_SocketManager *socketManager, int argc, char **argv)
        client (host);
         timeout (10);
        wait ();
-        timeout (0);
+        timeout (-1);
        send_initRequest();
        wait ();
     }