/*
- * Copyright (c) 1998-2000, Index Data.
+ * Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
- * $Log: yaz-my-client.cpp,v $
- * Revision 1.6 2001-04-17 16:21:21 heikki
- * Working on UrsulaRenewal, Request, and Update
- *
- * Revision 1.5 2001/04/10 10:48:08 adam
- * Fixed problem where proxy could cash bad result sets.
- *
- * Revision 1.4 2001/04/05 15:12:24 adam
- * WIN32 updates.
- *
- * Revision 1.3 2001/04/05 13:09:44 adam
- * Removed ursula dependancy.
- *
- * Revision 1.2 2001/04/04 14:02:49 adam
- * URSULA / Z-ruth service.
- *
- * Revision 1.1 2001/03/27 14:47:45 adam
- * New server facility scheme.
- *
- * Revision 1.17 2001/03/26 14:43:49 adam
- * New threaded PDU association.
- *
- * 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
- * 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
- * Many improvements. Modified to proxy server to work with "sessions"
- * based on cookies.
- *
- * Revision 1.6 1999/04/20 10:30:05 adam
- * Implemented various stuff for client and proxy. Updated calls
- * to ODR to reflect new name parameter.
- *
- * Revision 1.5 1999/04/09 11:46:57 adam
- * Added object Yaz_Z_Assoc. Much more functional client.
- *
- * Revision 1.4 1999/03/23 14:17:57 adam
- * More work on timeout handling. Work on yaz-client.
- *
- * Revision 1.3 1999/02/02 14:01:18 adam
- * First WIN32 port of YAZ++.
- *
- * Revision 1.2 1999/01/28 13:08:42 adam
- * Yaz_PDU_Assoc better encapsulated. Memory leak fix in
- * yaz-socket-manager.cc.
- *
- * Revision 1.1.1.1 1999/01/28 09:41:07 adam
- * First implementation of YAZ++.
- *
+ * $Id: yaz-my-client.cpp,v 1.20 2005-06-08 13:28:06 adam Exp $
*/
+#include <stdlib.h>
#include <yaz/log.h>
#include <yaz/options.h>
#include <yaz/diagbib1.h>
#include <yaz/marcdisp.h>
-#include <yaz++/yaz-ir-assoc.h>
-#include <yaz++/yaz-pdu-assoc.h>
-#include <yaz++/yaz-socket-manager.h>
-
-#if HAVE_YAZ_URSULA_H
-#include <yaz/zes-ursula.h>
-#endif
+#include <yaz++/ir-assoc.h>
+#include <yaz++/pdu-assoc.h>
+#include <yaz++/socket-manager.h>
extern "C" {
#if HAVE_READLINE_READLINE_H
#endif
}
-class YAZ_EXPORT MyClient : public Yaz_IR_Assoc {
+using namespace yazpp_1;
+
+class YAZ_EXPORT MyClient : public IR_Assoc {
private:
int m_interactive_flag;
char m_thisCommand[1024];
char m_lastCommand[1024];
int m_setOffset;
- Yaz_SocketManager *m_socketManager;
+ SocketManager *m_socketManager;
public:
- MyClient(IYaz_PDU_Observable *the_PDU_Observable,
- Yaz_SocketManager *the_SocketManager);
- IYaz_PDU_Observer *sessionNotify(
- IYaz_PDU_Observable *the_PDU_Observable, int fd);
- int args(Yaz_SocketManager *socketManager, int argc, char **argv);
- int interactive(Yaz_SocketManager *socketManager);
+ MyClient(IPDU_Observable *the_PDU_Observable,
+ SocketManager *the_SocketManager);
+ IPDU_Observer *sessionNotify(
+ IPDU_Observable *the_PDU_Observable, int fd);
+ int args(SocketManager *socketManager, int argc, char **argv);
+ int interactive(SocketManager *socketManager);
int wait();
void recv_initResponse(Z_InitResponse *initResponse);
void recv_searchResponse(Z_SearchResponse *searchResponse);
int cmd_init(char *args);
int cmd_format(char *args);
int cmd_proxy(char *args);
-#if HAVE_YAZ_URSULA_H
- int cmd_ursula(char *args);
-#endif
};
set_lastReceived(-1);
}
-IYaz_PDU_Observer *MyClient::sessionNotify(
- IYaz_PDU_Observable *the_PDU_Observable, int fd)
+IPDU_Observer *MyClient::sessionNotify(IPDU_Observable *the_PDU_Observable,
+ int fd)
{
return new MyClient(the_PDU_Observable, m_socketManager);
}
-MyClient::MyClient(IYaz_PDU_Observable *the_PDU_Observable,
- Yaz_SocketManager *the_socketManager) :
- Yaz_IR_Assoc (the_PDU_Observable)
+MyClient::MyClient(IPDU_Observable *the_PDU_Observable,
+ SocketManager *the_socketManager) :
+ IR_Assoc (the_PDU_Observable)
{
m_setOffset = 1;
m_interactive_flag = 1;
return 0;
}
+
#define C_PROMPT "Z>"
int MyClient::cmd_connect(char *host)
client (host);
timeout (10);
wait ();
- timeout (0);
+ timeout (-1);
return 1;
}
client (host);
timeout (10);
wait ();
- timeout (0);
+ timeout (-1);
send_initRequest();
wait ();
return 1;
return 1;
}
-#if HAVE_YAZ_URSULA_H
-#if TEST_URSULA_REF
-int MyClient::cmd_ursula(char *args)
-{
- Z_APDU *apdu = create_Z_PDU(Z_APDU_extendedServicesRequest);
- Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
-
- req->packageType = odr_getoidbystr(odr_encode(), "1.2.840.10003");
-
- Z_External *ext = (Z_External *) odr_malloc(odr_encode(), sizeof(*ext));
- req->taskSpecificParameters = ext;
- ext->direct_reference = req->packageType;
- ext->descriptor = 0;
- ext->indirect_reference = 0;
-
- ext->which = Z_External_octet;
- ext->u.single_ASN1_type = (Odr_oct *)
- odr_malloc (odr_encode(), sizeof(Odr_oct));
-
- Z_UrsPDU *pdu = (Z_UrsPDU *) odr_malloc (odr_encode(), sizeof(*pdu));
- pdu->which = Z_UrsPDU_request;
- pdu->u.request = (Z_UrsRequest *)
- odr_malloc (odr_encode(), sizeof(*pdu->u.request));
- pdu->u.request->libraryNo = odr_strdup(odr_encode(), "000200");
- pdu->u.request->borrowerTickerNo = 0;
- pdu->u.request->disposalType = 0;
- pdu->u.request->lastUseDate = 0;
- pdu->u.request->num_items = 0;
- pdu->u.request->items = (Z_UrsRequestItem **) odr_nullval();
- pdu->u.request->counter = 0;
- pdu->u.request->priority = 0;
- pdu->u.request->disposalNote = 0;
- pdu->u.request->overrule = 0;
-
- if (!z_UrsPDU (odr_encode(), &pdu, 0, ""))
- {
- yaz_log (LOG_LOG, "ursula encoding failed");
- return 1;
- }
- char *buf =
- odr_getbuf (odr_encode(), &ext->u.single_ASN1_type->len, 0);
-
- ext->u.single_ASN1_type->buf = (unsigned char*)
- odr_malloc (odr_encode(), ext->u.single_ASN1_type->len);
- memcpy (ext->u.single_ASN1_type->buf, buf, ext->u.single_ASN1_type->len);
- ext->u.single_ASN1_type->size = ext->u.single_ASN1_type->len;
-
- if (send_Z_PDU(apdu) >= 0)
- wait();
- return 1;
-}
-#else // not request testing
-
-int MyClient::cmd_ursula(char *args)
-{
- Z_APDU *apdu = create_Z_PDU(Z_APDU_extendedServicesRequest);
- Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
-
- req->packageType = odr_getoidbystr(odr_encode(), "1.2.840.10003");
-
- Z_External *ext = (Z_External *) odr_malloc(odr_encode(), sizeof(*ext));
- req->taskSpecificParameters = ext;
- ext->direct_reference = req->packageType;
- ext->descriptor = 0;
- ext->indirect_reference = 0;
-
- ext->which = Z_External_octet;
- ext->u.single_ASN1_type = (Odr_oct *)
- odr_malloc (odr_encode(), sizeof(Odr_oct));
-
- Z_UrsPDU *pdu = (Z_UrsPDU *) odr_malloc (odr_encode(), sizeof(*pdu));
- pdu->which = Z_UrsPDU_renewal;
- pdu->u.renewal = (Z_UrsRenewal *)
- odr_malloc (odr_encode(), sizeof(*pdu->u.renewal));
- pdu->u.renewal->libraryNo = odr_strdup(odr_encode(), "000200");
- pdu->u.renewal->borrowerTicketNo = 0;
-
- if (!z_UrsPDU (odr_encode(), &pdu, 0, ""))
- {
- yaz_log (LOG_LOG, "ursula encoding failed");
- return 1;
- }
- char *buf =
- odr_getbuf (odr_encode(), &ext->u.single_ASN1_type->len, 0);
-
- ext->u.single_ASN1_type->buf = (unsigned char*)
- odr_malloc (odr_encode(), ext->u.single_ASN1_type->len);
- memcpy (ext->u.single_ASN1_type->buf, buf, ext->u.single_ASN1_type->len);
- ext->u.single_ASN1_type->size = ext->u.single_ASN1_type->len;
-
- if (send_Z_PDU(apdu) >= 0)
- wait();
- return 1;
-}
-
-#endif
-
-#endif
-
int MyClient::processCommand(const char *commandLine)
{
char cmdStr[1024], cmdArgs[1024];
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>]"},
{"init", &MyClient::cmd_init, ""},
{"format", &MyClient::cmd_format, "<record-syntax>"},
{"proxy", &MyClient::cmd_proxy, "<host>:[':'<port>]"},
-#if HAVE_YAZ_URSULA_H
- {"ursula", &MyClient::cmd_ursula, ""},
-#endif
{0,0,0}
};
return m_lastCommand;
}
-int MyClient::interactive(Yaz_SocketManager *socketManager)
+int MyClient::interactive(SocketManager *socketManager)
{
const char *cmd;
if (!m_interactive_flag)
return 0;
}
-int MyClient::args(Yaz_SocketManager *socketManager, int argc, char **argv)
+int MyClient::args(SocketManager *socketManager, int argc, char **argv)
{
char *host = 0;
char *proxy = 0;
client (host);
timeout (10);
wait ();
- timeout (0);
+ timeout (-1);
send_initRequest();
wait ();
}
int main(int argc, char **argv)
{
- Yaz_SocketManager mySocketManager;
- Yaz_PDU_Assoc *some = new Yaz_PDU_Assoc(&mySocketManager);
+ SocketManager mySocketManager;
+ PDU_Assoc *some = new PDU_Assoc(&mySocketManager);
MyClient z(some, &mySocketManager);