/*
- * 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.8 1999-11-10 10:02:34 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.
+ *
+ * Revision 1.8 1999/11/10 10:02:34 adam
* Work on proxy.
*
* Revision 1.7 1999/04/21 12:09:01 adam
*
*/
-#include <log.h>
-#include <options.h>
-#include <diagbib1.h>
-#include <yaz-ir-assoc.h>
-#include <yaz-pdu-assoc.h>
-#include <yaz-socket-manager.h>
+#include <yaz/log.h>
+#include <yaz/options.h>
+#include <yaz/diagbib1.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
void recv_genericRecord(Z_GenericRecord *r);
void display_genericRecord(Z_GenericRecord *r, int level);
void display_variant(Z_Variant *v, int level);
+ 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);
+ int cmd_connect(char *host);
int cmd_quit(char *args);
int cmd_close(char *args);
int cmd_find(char *args);
int cmd_show(char *args);
int cmd_cookie(char *args);
int cmd_init(char *args);
+ int cmd_format(char *args);
+ int cmd_proxy(char *args);
};
+
+void MyClient::connectNotify()
+{
+ printf ("Connection accepted by target\n");
+ set_lastReceived(-1);
+}
+
+void MyClient::timeoutNotify()
+{
+ printf ("Connection timeout\n");
+ close();
+}
+
+void MyClient::failNotify()
+{
+ printf ("Connection closed by target\n");
+ set_lastReceived(-1);
+}
+
IYaz_PDU_Observer *MyClient::clone(IYaz_PDU_Observable *the_PDU_Observable)
{
return new MyClient(the_PDU_Observable, m_socketManager);
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");
}
#define C_PROMPT "Z>"
+int MyClient::cmd_connect(char *host)
+{
+ client (host);
+ timeout (10);
+ wait ();
+ timeout (0);
+ return 1;
+}
+
int MyClient::cmd_open(char *host)
{
client (host);
- m_socketManager->processEvent();
+ timeout (10);
+ wait ();
+ timeout (0);
+ send_initRequest();
+ wait ();
return 1;
}
}
if (send_searchRequest(&query) >= 0)
wait();
+ else
+ printf ("Not connected\n");
return 1;
}
m_setOffset = start;
if (send_presentRequest(start, number) >= 0)
wait();
+ else
+ printf ("Not connected\n");
return 1;
}
return 1;
}
+int MyClient::cmd_format(char *args)
+{
+ set_preferredRecordSyntax(args);
+ return 1;
+}
+
+int MyClient::cmd_proxy(char *args)
+{
+ set_proxy(args);
+ return 1;
+}
+
int MyClient::processCommand(const char *commandLine)
{
char cmdStr[1024], cmdArgs[1024];
int (MyClient::*fun)(char *arg);
char *ad;
} cmd[] = {
- {"open", &cmd_open, "<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, ""},
+ {"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}
};
char *prog = argv[0];
int ret;
- while ((ret = options("p:v:q", argv, argc, &arg)) != -2)
+ while ((ret = options("c:p:v:q", argv, argc, &arg)) != -2)
{
switch (ret)
{
}
set_proxy(arg);
break;
+ case 'c':
+ 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;
if (host)
{
client (host);
+ timeout (10);
+ wait ();
+ timeout (0);
send_initRequest();
wait ();
}
exit (1);
if (z.interactive(&mySocketManager))
exit (1);
+ return 0;
}
projects / yazpp-moved-to-github.git / blobdiff