X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-client.cpp;h=de00fd16d5b8cd79f540e29e1edc15af689e6a4c;hp=e7f66e838bf51f121103c56c8d5318aa6abe3010;hb=e3133d2f2c580f76c9da2e7621c74a064f0955c9;hpb=26b3f7f15abcb69aaf00fb6bdaf410ff3e7de14c

diff --git a/src/yaz-client.cpp b/src/yaz-client.cpp
index e7f66e8..de00fd1 100644
--- a/src/yaz-client.cpp
+++ b/src/yaz-client.cpp
@@ -1,10 +1,29 @@
 /*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-client.cpp,v $
- * Revision 1.9  1999-12-06 13:52:45  adam
+ * 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
+ * minor change to stop g++ 2.95.2 complaining about taking the address
+ * of a member function.
+ *
+ * Revision 1.9  1999/12/06 13:52:45  adam
  * Modified for new location of YAZ header files. Experimental threaded
  * operation.
  *
@@ -40,9 +59,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
@@ -82,6 +101,7 @@ public:
     void connectNotify();
     void failNotify();
     void timeoutNotify();
+    char *get_cookie (Z_OtherInformation **oi);
     int processCommand(const char *cmd);
     const char *MyClient::getCommand();
     int cmd_open(char *host);
@@ -133,15 +153,40 @@ MyClient::MyClient(IYaz_PDU_Observable *the_PDU_Observable,
 
 void usage(char *prog)
 {
-    fprintf (stderr, "%s: [-v log] [-p proxy] [zurl]\n", prog);
+    fprintf (stderr, "%s: [-v log] [-c cookie] [-p proxy] [zurl]\n", prog);
     exit (1);
 }
 
+char *MyClient::get_cookie(Z_OtherInformation **otherInfo)
+{
+    int oid[OID_SIZE];
+    Z_OtherInformationUnit *oi;
+    struct oident ent;
+    ent.proto = PROTO_Z3950;
+    ent.oclass = CLASS_USERINFO;
+    ent.value = (oid_value) VAL_COOKIE;
+
+    if (oid_ent_to_oid (&ent, oid) && 
+	(oi = update_otherInformation(otherInfo, 0, oid, 1, 1)) &&
+	oi->which == Z_OtherInfo_characterInfo)
+	return oi->information.characterInfo;
+    return 0;
+}
+
 void MyClient::recv_initResponse(Z_InitResponse *initResponse)
 {
     printf ("Got InitResponse. Status ");
     if (*initResponse->result)
+    {
 	printf ("Ok\n");
+
+	const char *p = get_cookie (&initResponse->otherInfo);
+	if (p)
+	{
+	    printf ("cookie = %s\n", p);
+	    set_cookie(p);
+	}
+    }
     else
 	printf ("Fail\n");
 }
@@ -518,16 +563,16 @@ int MyClient::processCommand(const char *commandLine)
         int (MyClient::*fun)(char *arg);
         char *ad;
     } cmd[] = {
-	{"open", &cmd_open, "<host>[':'<port>][/<database>]"},
-	{"connect", &cmd_connect, "<host>[':'<port>][/<database>]"},
-	{"quit", &cmd_quit, ""},
-	{"close", &cmd_close, ""},
-	{"find", &cmd_find, "<query>"},
-	{"show", &cmd_show, "[<start> [<number>]]"},
-	{"cookie", &cmd_cookie, "<cookie>"},
-	{"init", &cmd_init, ""},
-	{"format", &cmd_format, "<record-syntax>"},
-	{"proxy", &cmd_proxy, "<host>:[':'<port>]"},
+	{"open", &MyClient::cmd_open, "<host>[':'<port>][/<database>]"},
+	{"connect", &MyClient::cmd_connect, "<host>[':'<port>][/<database>]"},
+	{"quit", &MyClient::cmd_quit, ""},
+	{"close", &MyClient::cmd_close, ""},
+	{"find", &MyClient::cmd_find, "<query>"},
+	{"show", &MyClient::cmd_show, "[<start> [<number>]]"},
+	{"cookie", &MyClient::cmd_cookie, "<cookie>"},
+	{"init", &MyClient::cmd_init, ""},
+	{"format", &MyClient::cmd_format, "<record-syntax>"},
+	{"proxy", &MyClient::cmd_proxy, "<host>:[':'<port>]"},
 	{0,0,0}
     };
     
@@ -633,7 +678,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;
@@ -666,4 +711,5 @@ int main(int argc, char **argv)
 	exit (1);
     if (z.interactive(&mySocketManager))
 	exit (1);
+    return 0;
 }