X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-client.cpp;h=8670d4f17f5564ea85e158e6b612f4b2d63b3f7d;hb=3b58e2f8d81f47c9c9cc86dbd2cdebf8621d8559;hp=a6558dc84e04196ffadd199f76d7ea0d60bb38de;hpb=acd0ff2a7f87fb33a82475dcc7aa44cd7189d4c0;p=yazpp-moved-to-github.git

diff --git a/src/yaz-client.cpp b/src/yaz-client.cpp
index a6558dc..8670d4f 100644
--- a/src/yaz-client.cpp
+++ b/src/yaz-client.cpp
@@ -1,10 +1,25 @@
 /*
  * Copyright (c) 1998-2000, Index Data.
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-client.cpp,v $
- * Revision 1.11  2000-07-04 13:48:49  adam
+ * Revision 1.16  2000-11-01 14:22:59  adam
+ * Added fd parameter for method IYaz_PDU_Observer::clone.
+ *
+ * Revision 1.15  2000/10/11 11:58:16  adam
+ * Moved header files to include/yaz++. Switched to libtool and automake.
+ * Configure script creates yaz++-config script.
+ *
+ * Revision 1.14  2000/09/08 10:23:42  adam
+ * Added skeleton of yaz-z-server.
+ *
+ * Revision 1.13  2000/09/06 14:23:45  adam
+ * WIN32 updates.
+ *
+ * Revision 1.12  2000/09/04 08:59:16  adam
+ * Changed call to logging functions (yaz_ added).
+ *
+ * Revision 1.11  2000/07/04 13:48:49  adam
  * Implemented upper-limit on proxy-to-target sessions.
  *
  * Revision 1.10  2000/05/30 03:12:27  ian
@@ -47,9 +62,9 @@
 #include <yaz/log.h>
 #include <yaz/options.h>
 #include <yaz/diagbib1.h>
-#include <yaz-ir-assoc.h>
-#include <yaz-pdu-assoc.h>
-#include <yaz-socket-manager.h>
+#include <yaz++/yaz-ir-assoc.h>
+#include <yaz++/yaz-pdu-assoc.h>
+#include <yaz++/yaz-socket-manager.h>
 
 extern "C" {
 #if HAVE_READLINE_READLINE_H
@@ -70,7 +85,7 @@ private:
 public:
     MyClient(IYaz_PDU_Observable *the_PDU_Observable,
 	     Yaz_SocketManager *the_SocketManager);
-    IYaz_PDU_Observer *clone(IYaz_PDU_Observable *the_PDU_Observable);
+    IYaz_PDU_Observer *clone(IYaz_PDU_Observable *the_PDU_Observable, int fd);
     int args(Yaz_SocketManager *socketManager, int argc, char **argv);
     int interactive(Yaz_SocketManager *socketManager);
     int wait();
@@ -123,7 +138,8 @@ void MyClient::failNotify()
     set_lastReceived(-1);
 }
 
-IYaz_PDU_Observer *MyClient::clone(IYaz_PDU_Observable *the_PDU_Observable)
+IYaz_PDU_Observer *MyClient::clone(IYaz_PDU_Observable *the_PDU_Observable,
+				   int fd)
 { 
     return new MyClient(the_PDU_Observable, m_socketManager);
 }
@@ -666,7 +682,7 @@ int MyClient::args(Yaz_SocketManager *socketManager, int argc, char **argv)
 	    set_cookie(arg);
 	    break;
 	case 'v':
-	    log_init_level (log_mask_str(arg));
+	    yaz_log_init_level (yaz_log_mask_str(arg));
 	    break;
 	case 'q':
 	    m_interactive_flag = 0;
@@ -699,4 +715,5 @@ int main(int argc, char **argv)
 	exit (1);
     if (z.interactive(&mySocketManager))
 	exit (1);
+    return 0;
 }