Remove private extended service URSULA

[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 ec970ad..0df0b00 100644 (file)
--- a/src/yaz-my-client.cpp
+++ b/src/yaz-my-client.cpp
@@ -1,93 +1,17 @@
 /*
- * Copyright (c) 1998-2000, Index Data.
+ * Copyright (c) 1998-2001, Index Data.
  * See the file LICENSE for details.
  * 
- * $Log: yaz-my-client.cpp,v $
- * 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.12 2002-10-28 12:16:09 adam Exp $
  */
 
 #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
@@ -141,9 +65,6 @@ public:
     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
 };
 
 
@@ -525,6 +446,7 @@ int MyClient::wait()
     return 0;
 }
 
+
 #define C_PROMPT "Z>"
 
 int MyClient::cmd_connect(char *host)
@@ -614,58 +536,6 @@ int MyClient::cmd_proxy(char *args)
     return 1;
 }
 
-#if HAVE_YAZ_URSULA_H
-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;
-}
-#endif
-
 int MyClient::processCommand(const char *commandLine)
 {
     char cmdStr[1024], cmdArgs[1024];
@@ -686,9 +556,6 @@ int MyClient::processCommand(const char *commandLine)
        {"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}
     };