X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=0327810d8fc67e19a2a440acf24431b4d0a28570;hb=dfcd482cb9c615dd3f0410d20f5d9a398e701ade;hp=9a43b9507461854fd5de36046c7f9e179c0f25ce;hpb=fb36df3c32d9023ca55f8050ea4128f42d2dfc34;p=yaz-moved-to-github.git diff --git a/client/client.c b/client/client.c index 9a43b95..2692a9c 100644 --- a/client/client.c +++ b/client/client.c @@ -1,413 +1,67 @@ -/* - * Copyright (c) 1995-2001, Index Data +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2009 Index Data * See the file LICENSE for details. - * - * $Log: client.c,v $ - * Revision 1.118 2001-03-27 14:48:06 adam - * Fixed scan for bad CCL. - * - * Revision 1.117 2001/03/25 21:55:12 adam - * Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate. - * - * Revision 1.116 2001/03/21 12:43:36 adam - * Implemented cs_create_host. Better error reporting for SSL comstack. - * - * Revision 1.115 2001/03/13 18:10:58 adam - * Added option -c to set CCL config file. - * - * Revision 1.114 2001/02/21 13:46:53 adam - * C++ fixes. - * - * Revision 1.113 2001/02/21 09:41:15 adam - * Fixed problem with old codecs. - * - * Revision 1.112 2001/02/20 11:25:32 adam - * Added ill_get_APDU and ill_get_Cancel. - * - * Revision 1.111 2001/01/30 15:52:48 ja7 - * added command for setting packageName in ES packages! - * command is named packagename default is NULL for server suplyed package name - * - * Revision 1.110 2001/01/29 11:19:05 adam - * Clients prints options in InitResponse. - * - * Revision 1.109 2001/01/22 10:41:47 adam - * Multiple attribute may be specified for sorging. - * - * Revision 1.108 2000/11/23 10:58:32 adam - * SSL comstack support. Separate POSIX thread support library. - * - * Revision 1.107 2000/11/16 13:11:07 adam - * Changed because ccl_rpn_query sets attribute set. - * - * Revision 1.106 2000/11/13 09:44:59 adam - * Work on SCAN: RPN2CCL conversion and proper "next" scan. - * - * Revision 1.105 2000/10/02 11:07:44 adam - * Added peer_name member for bend_init handler. Changed the YAZ - * client so that tcp: can be avoided in target spec. - * - * Revision 1.104 2000/09/04 08:58:15 adam - * Added prefix yaz_ for most logging utility functions. - * - * Revision 1.103 2000/08/10 08:41:26 adam - * Fixes for ILL. - * - * Revision 1.102 2000/05/18 11:57:04 adam - * Client display time elapsed. - * - * Revision 1.101 2000/04/05 07:39:54 adam - * Added shared library support (libtool). - * - * Revision 1.100 2000/03/20 19:29:59 adam - * Minor change. - * - * Revision 1.99 2000/03/20 19:06:25 adam - * Added Segment request for fronend server. Work on admin for client. - * - * Revision 1.98 2000/03/16 13:55:49 ian - * Added commands for sending shutdown and startup admin requests via the admin ES. - * - * Revision 1.97 2000/03/14 14:06:04 ian - * Minor change to order of debugging output for send_apdu, - * fixed encoding of admin request. - * - * Revision 1.96 2000/03/14 09:27:07 ian - * Added code to enable sending of admin extended service requests - * - * Revision 1.95 2000/02/28 11:20:05 adam - * Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL. - * - * Revision 1.94 2000/01/31 13:15:21 adam - * Removed uses of assert(3). Cleanup of ODR. CCL parser update so - * that some characters are not surrounded by spaces in resulting term. - * ILL-code updates. - * - * Revision 1.93 2000/01/15 09:39:50 adam - * Implemented ill_get_ILLRequest. More ILL testing for client. - * - * Revision 1.92 1999/12/21 16:24:48 adam - * More robust ISO2709 handling (in case of real bad formats). - * - * Revision 1.91 1999/12/16 23:36:19 adam - * Implemented ILL protocol. Minor updates ASN.1 compiler. - * - * Revision 1.90 1999/11/30 13:47:11 adam - * Improved installation. Moved header files to include/yaz. - * - * Revision 1.89 1999/11/04 14:58:44 adam - * Added status elements for backend delete result set handler. - * Updated delete result result set command for client. - * - * Revision 1.88 1999/10/11 10:00:29 adam - * Modified printing of records. - * - * Revision 1.87 1999/08/27 09:40:32 adam - * Renamed logf function to yaz_log. Removed VC++ project files. - * - * Revision 1.86 1999/07/06 12:13:35 adam - * Added "schema" command. - * - * Revision 1.85 1999/06/16 11:55:24 adam - * Added APDU log to client. - * - * Revision 1.84 1999/06/01 14:29:11 adam - * Work on Extended Services. - * - * Revision 1.83 1999/05/26 15:24:26 adam - * Fixed minor bugs regarding DB Update (introduced by previous commit). - * - * Revision 1.82 1999/05/26 13:49:12 adam - * DB Update implemented in client (very basic). - * - * Revision 1.81 1999/04/20 09:56:48 adam - * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun). - * Modified all encoders/decoders to reflect this change. - * - * Revision 1.80 1999/03/31 11:18:24 adam - * Implemented odr_strdup. Added Reference ID to backend server API. - * - * Revision 1.79 1999/03/23 14:14:25 adam - * Yet another fix. - * - * Revision 1.78 1999/03/18 12:57:18 adam - * Minor fix. - * - * Revision 1.77 1999/03/11 15:26:51 adam - * Fixed bug (introduced by previous commit). - * - * Revision 1.76 1999/03/11 11:12:07 adam - * Added GNU readline support. HTML display in client. - * - * Revision 1.75 1999/02/01 15:37:32 adam - * Fixed minor bug introduced by previous commit. - * - * Revision 1.74 1999/02/01 15:35:21 adam - * Added XML display. - * - * Revision 1.73 1998/10/20 13:55:43 quinn - * Fixed Scan bug in asn and client - * - * Revision 1.72 1998/10/20 13:23:15 quinn - * changed preferred pos to 1 - * - * Revision 1.71 1998/10/20 13:21:43 adam - * Fixed scan response handler. - * - * Revision 1.70 1998/09/22 09:40:37 adam - * Minor changes in sort spec. - * - * Revision 1.69 1998/08/19 16:10:06 adam - * Changed som member names of DeleteResultSetRequest/Response. - * - * Revision 1.68 1998/07/20 12:37:06 adam - * Added 'delete ' command. Changed open command so that - * it reconnects if already connected. - * - * Revision 1.67 1998/06/09 13:55:06 adam - * Minor changes. - * - * Revision 1.66 1998/05/18 13:06:53 adam - * Changed the way attribute sets are handled by the retriaval module. - * Extended Explain conversion / schema. - * Modified server and client to work with ASN.1 compiled protocol handlers. - * - * Revision 1.65 1998/03/31 15:13:19 adam - * Development towards compiled ASN.1. - * - * Revision 1.64 1998/03/31 11:07:44 adam - * Furhter work on UNIverse resource report. - * Added Extended Services handling in frontend server. - * - * Revision 1.63 1998/03/05 08:05:10 adam - * Added a few casts to make C++ happy. - * - * Revision 1.62 1998/02/11 11:53:33 adam - * Changed code so that it compiles as C++. - * - * Revision 1.61 1998/02/10 11:03:06 adam - * Implemented command refid. Client prints reference-ID's, when present, - * in responses. - * - * Revision 1.60 1998/01/29 14:08:52 adam - * Better sort diagnostics. - * - * Revision 1.59 1998/01/29 13:17:56 adam - * Added sort. - * - * Revision 1.58 1998/01/07 13:51:45 adam - * Minor change. - * - * Revision 1.57 1998/01/07 12:58:22 adam - * Using fgets instead of gets. - * - * Revision 1.56 1997/11/05 09:18:31 adam - * The client handles records with no associated syntax. - * - * Revision 1.55 1997/10/31 12:20:08 adam - * Improved memory debugging for xmalloc/nmem.c. References to NMEM - * instead of ODR in n ESPEC-1 handling in source d1_espec.c. - * Bug fix: missing fclose in data1_read_espec1. - * - * Revision 1.54 1997/10/27 13:52:46 adam - * Header yaz-util includes all YAZ utility header files. - * - * Revision 1.53 1997/09/29 13:18:59 adam - * Added function, oid_ent_to_oid, to replace the function - * oid_getoidbyent, which is not thread safe. - * - * Revision 1.52 1997/09/29 07:20:31 adam - * Client code uses nmem_init. - * - * Revision 1.51 1997/09/26 09:41:55 adam - * Updated client to handle multiple diagnostics. - * - * Revision 1.50 1997/09/17 12:10:29 adam - * YAZ version 1.4. - * - * Revision 1.49 1997/09/04 13:45:17 adam - * Added UNImarc to list of available syntaxes. - * - * Revision 1.48 1997/09/01 08:48:44 adam - * New windows NT/95 port using MSV5.0. Only a few changes made - * to avoid warnings. Sub project created: client.dsp. - * - * Revision 1.47 1997/07/01 13:49:56 adam - * Take care of case when invalid target is specified on command line. - * - * Revision 1.46 1997/06/23 10:30:18 adam - * Added call to ccl_rpn_delete in search. Added ODR stream "out" - * as parameter to ccl_rpn_query to release RPN query. - * - * Revision 1.45 1997/05/14 06:53:29 adam - * C++ support. - * - * Revision 1.44 1997/05/05 11:20:35 adam - * Client uses "options" utility and marc dump filename may be specified - * as an option (-m ). - * - * Revision 1.43 1996/11/08 11:03:26 adam - * Client accepts multiple database names. - * - * Revision 1.42 1996/10/08 10:44:57 quinn - * Resolved conflicts. - * - * Revision 1.41 1996/10/07 15:29:03 quinn - * Work - * - * Revision 1.40 1996/08/29 14:19:34 quinn - * Fixed conflict (CVS) - * - * Revision 1.39 1996/08/27 10:43:22 quinn - * Made select() optional - * - * Revision 1.38 1996/08/12 14:09:11 adam - * Default prefix query attribute set defined by using p_query_attset. - * - * Revision 1.37 1996/07/06 19:58:29 quinn - * System headerfiles gathered in yconfig - * - * Revision 1.36 1996/06/10 08:53:47 quinn - * Added Summary - * - * Revision 1.35 1996/06/03 09:45:50 quinn - * Added display of OIDs in the GRS routine. - * - * Revision 1.34 1996/05/09 07:26:49 quinn - * *** empty log message *** - * - * Revision 1.33 1996/05/09 07:25:22 quinn - * Small - * - * Revision 1.32 1996/03/15 11:05:33 adam - * The user can set the preferred query type (prefix, ccl, ..) with the - * querytype command. - * - * Revision 1.31 1996/02/20 12:51:54 quinn - * Fixed problems with EXTERNAL. - * - * Revision 1.30 1996/02/12 18:18:09 quinn - * Fidgeting. - * - * Revision 1.29 1996/01/02 08:57:25 quinn - * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass - * - * Revision 1.28 1995/12/14 11:09:31 quinn - * Added Explain record syntax to the format command. - * - * Revision 1.27 1995/12/12 16:37:02 quinn - * Added destroy element to data1_node. - * - * Revision 1.26 1995/12/12 14:11:00 quinn - * Minimal. - * - * Revision 1.25 1995/11/13 09:27:22 quinn - * Fiddling with the variant stuff. - * - * Revision 1.24 1995/10/30 12:41:13 quinn - * Added hostname lookup for server. - * - * Revision 1.23 1995/10/18 16:12:30 quinn - * Better diagnostics. - * - * Revision 1.22 1995/10/11 14:49:12 quinn - * Smallish. - * - * Revision 1.21 1995/09/29 17:01:47 quinn - * More Windows work - * - * Revision 1.20 1995/08/29 14:24:13 quinn - * Added second half of close-handshake - * - * Revision 1.19 1995/08/29 11:17:28 quinn - * Added code to receive close - * - * Revision 1.18 1995/08/28 12:21:27 quinn - * Client can now ask for simple element set names. - * - * Revision 1.17 1995/08/17 12:45:02 quinn - * Fixed minor problems with GRS-1. Added support in c&s. - * - * Revision 1.16 1995/08/15 12:00:04 quinn - * Updated External - * - * Revision 1.15 1995/06/22 09:28:03 quinn - * Fixed bug in SUTRS processing. - * - * Revision 1.14 1995/06/19 12:37:41 quinn - * Added BER dumper. - * - * Revision 1.13 1995/06/16 10:29:11 quinn - * *** empty log message *** - * - * Revision 1.12 1995/06/15 07:44:57 quinn - * Moving to v3. - * - * Revision 1.11 1995/06/14 15:26:40 quinn - * *** empty log message *** - * - * Revision 1.10 1995/06/06 14:56:58 quinn - * Better diagnostics. - * - * Revision 1.9 1995/06/06 08:15:19 quinn - * Cosmetic. - * - * Revision 1.8 1995/06/05 10:52:22 quinn - * Added SCAN. - * - * Revision 1.7 1995/06/02 09:50:09 quinn - * Smallish. - * - * Revision 1.6 1995/05/31 08:29:21 quinn - * Nothing significant. - * - * Revision 1.5 1995/05/29 08:10:47 quinn - * Moved oid.c to util. - * - * Revision 1.4 1995/05/22 15:30:13 adam - * Client uses prefix query notation. - * - * Revision 1.3 1995/05/22 15:06:53 quinn - * *** empty log message *** - * - * Revision 1.2 1995/05/22 14:56:40 quinn - * *** empty log message *** - * - * Revision 1.1 1995/05/22 11:30:31 quinn - * Added prettier client. - * - * */ - -/* - * This is the obligatory little toy client, whose primary purpose is - * to illustrate the use of the YAZ service-level API. +/** \file client.c + * \brief yaz-client program */ #include #include +#include #include +#include +#ifndef WIN32 +#include +#endif +#if HAVE_SYS_TYPES_H +#include +#endif +#if HAVE_LOCALE_H +#include +#endif +#if HAVE_LANGINFO_H +#include +#endif +#if HAVE_UNISTD_H +#include +#endif +#if HAVE_SYS_STAT_H +#include +#endif +#if HAVE_SYS_TIME_H +#include +#endif + +#ifdef WIN32 +#include +#include +#include +#define S_ISREG(x) (x & _S_IFREG) +#define S_ISDIR(x) (x & _S_IFDIR) +#endif #include -#include -#ifdef USE_XTIMOSI -#include -#endif +#include +#include +#define NO_OID 1 #include #include #include +#include +#include +#include #include +#include -#ifdef ASN_COMPILED #include -#endif - -#if CCL2RPN +#include #include -#endif +#include +#include #if HAVE_READLINE_READLINE_H #include @@ -416,60 +70,196 @@ #include #endif + #include "admin.h" +#include "tabcomplete.h" +#include "fhistory.h" #define C_PROMPT "Z> " +static file_history_t file_history = 0; + +static char sru_method[10] = "soap"; +static char sru_version[10] = "1.2"; +static char *codeset = 0; /* character set for output */ +static int hex_dump = 0; +static char *dump_file_prefix = 0; static ODR out, in, print; /* encoding and decoding streams */ +#if YAZ_HAVE_XML2 +static ODR srw_sr_odr_out = 0; +static Z_SRW_PDU *srw_sr = 0; +#endif static FILE *apdu_file = 0; +static FILE *ber_file = 0; static COMSTACK conn = 0; /* our z-association */ + static Z_IdAuthentication *auth = 0; /* our current auth definition */ +static NMEM nmem_auth = NULL; + char *databaseNames[128]; int num_databaseNames = 0; static Z_External *record_last = 0; -static int setnumber = 0; /* current result set number */ +static int setnumber = -1; /* current result set number */ static int smallSetUpperBound = 0; static int largeSetLowerBound = 1; static int mediumSetPresentNumber = 0; -static Z_ElementSetNames *elementSetNames = 0; -static int setno = 1; /* current set offset */ +static Z_ElementSetNames *elementSetNames = 0; +static Odr_int setno = 1; /* current set offset */ static enum oid_proto protocol = PROTO_Z3950; /* current app protocol */ -static enum oid_value recordsyntax = VAL_USMARC; -static enum oid_value schema = VAL_NONE; +#define RECORDSYNTAX_MAX 20 +static char *recordsyntax_list[RECORDSYNTAX_MAX]; +static int recordsyntax_size = 0; + +static char *record_schema = 0; static int sent_close = 0; -static NMEM session_mem = NULL; /* memory handle for init-response */ -static Z_InitResponse *session = 0; /* session parameters */ +static NMEM session_mem = NULL; /* memory handle for init-response */ +static Z_InitResponse *session_initResponse = 0; /* session parameters */ static char last_scan_line[512] = "0"; static char last_scan_query[512] = "0"; static char ccl_fields[512] = "default.bib"; -char* esPackageName = 0; - -static char last_cmd[100] = "?"; -static FILE *marcdump = 0; +/* ### How can I set this path to use wherever YAZ is installed? */ +static char cql_fields[512] = "/usr/local/share/yaz/etc/pqf.properties"; +static char *esPackageName = 0; +static char *yazProxy = 0; +static int kilobytes = 1024; +static char *negotiationCharset = 0; +static int negotiationCharsetRecords = 1; +static int negotiationCharsetVersion = 3; +static char *outputCharset = 0; +static char *marcCharset = 0; +static char *queryCharset = 0; +static char* yazLang = 0; + +static char last_cmd[32] = "?"; +static FILE *marc_file = 0; static char *refid = NULL; +static int auto_reconnect = 0; +static int auto_wait = 1; +static Odr_bitmask z3950_options; +static int z3950_version = 3; +static int scan_stepSize = 0; +static int scan_position = 1; +static int scan_size = 20; +static char cur_host[200]; +static int last_hit_count = 0; typedef enum { QueryType_Prefix, QueryType_CCL, - QueryType_CCL2RPN + QueryType_CCL2RPN, + QueryType_CQL, + QueryType_CQL2RPN } QueryType; static QueryType queryType = QueryType_Prefix; -#if CCL2RPN static CCL_bibset bibset; /* CCL bibset handle */ +static cql_transform_t cqltrans = 0; /* CQL context-set handle */ + +#if HAVE_READLINE_COMPLETION_OVER + +#else +/* readline doesn't have this var. Define it ourselves. */ +int rl_attempted_completion_over = 0; +#endif + +#define maxOtherInfosSupported 10 +struct eoi { + Odr_oid oid[OID_SIZE]; + char* value; +} extraOtherInfos[maxOtherInfosSupported]; + +void process_cmd_line(char* line); +#if HAVE_READLINE_READLINE_H +char **readline_completer(char *text, int start, int end); #endif +static char *command_generator(const char *text, int state); +int cmd_register_tab(const char* arg); +int cmd_querycharset(const char *arg); + +static void close_session(void); + +static void marc_file_write(const char *buf, size_t sz); -ODR getODROutputStream() +static void wait_and_handle_response(int one_response_only); + +ODR getODROutputStream(void) { return out; } -void send_apdu(Z_APDU *a) +const char* query_type_as_string(QueryType q) +{ + switch (q) { + case QueryType_Prefix: return "prefix (RPN sent to server)"; + case QueryType_CCL: return "CCL (CCL sent to server) "; + case QueryType_CCL2RPN: return "CCL -> RPN (RPN sent to server)"; + case QueryType_CQL: return "CQL (CQL sent to server)"; + case QueryType_CQL2RPN: return "CQL -> RPN (RPN sent to server)"; + default: + return "unknown Query type internal yaz-client error"; + } +} + +static void do_hex_dump(const char* buf, size_t len) +{ + if (hex_dump) + { + size_t i; + int x; + for (i = 0; i < len ; i = i+16 ) + { + printf(" %4.4ld ", (long) i); + for(x=0 ; i+x 0) + yaz_oi_set_string_oid(oi, out, extraOtherInfos[i].oid, + 1, extraOtherInfos[i].value); + } +} + +int send_apdu(Z_APDU *a) { char *buf; int len; + add_otherInfos(a); + if (apdu_file) { z_APDU(print, &a, 0, 0); @@ -478,77 +268,130 @@ void send_apdu(Z_APDU *a) if (!z_APDU(out, &a, 0, 0)) { odr_perror(out, "Encoding APDU"); - exit(1); + close_session(); + return 0; } buf = odr_getbuf(out, &len, 0); + if (ber_file) + odr_dumpBER(ber_file, buf, len); /* printf ("sending APDU of size %d\n", len); */ + do_hex_dump(buf, len); if (cs_put(conn, buf, len) < 0) { fprintf(stderr, "cs_put: %s", cs_errmsg(cs_errno(conn))); - exit(1); + close_session(); + return 0; } odr_reset(out); /* release the APDU structure */ + return 1; +} + +static void print_stringn(const unsigned char *buf, size_t len) +{ + size_t i; + for (i = 0; i= 32) || strchr("\n\r\t\f", buf[i])) + printf("%c", buf[i]); + else + printf("\\X%02X", buf[i]); } -static void print_refid (Z_ReferenceId *id) +static void print_refid(Z_ReferenceId *id) { if (id) { - printf ("ReferenceId: '%.*s'\n", id->len, id->buf); + printf("Reference Id: "); + print_stringn(id->buf, id->len); + printf("\n"); } } -static Z_ReferenceId *set_refid (ODR out) +static Z_ReferenceId *set_refid(ODR out) { Z_ReferenceId *id; if (!refid) return 0; - id = (Z_ReferenceId *) odr_malloc (out, sizeof(*id)); + id = (Z_ReferenceId *) odr_malloc(out, sizeof(*id)); id->size = id->len = strlen(refid); - id->buf = (unsigned char *) odr_malloc (out, id->len); - memcpy (id->buf, refid, id->len); + id->buf = (unsigned char *) odr_malloc(out, id->len); + memcpy(id->buf, refid, id->len); return id; -} +} /* INIT SERVICE ------------------------------- */ -static void send_initRequest() +static void send_initRequest(const char* type_and_host) { Z_APDU *apdu = zget_APDU(out, Z_APDU_initRequest); Z_InitRequest *req = apdu->u.initRequest; + int i; - ODR_MASK_SET(req->options, Z_Options_search); - ODR_MASK_SET(req->options, Z_Options_present); - ODR_MASK_SET(req->options, Z_Options_namedResultSets); - ODR_MASK_SET(req->options, Z_Options_triggerResourceCtrl); - ODR_MASK_SET(req->options, Z_Options_scan); - ODR_MASK_SET(req->options, Z_Options_sort); - ODR_MASK_SET(req->options, Z_Options_extendedServices); - ODR_MASK_SET(req->options, Z_Options_delSet); + req->options = &z3950_options; - ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1); - ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2); - ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3); + ODR_MASK_ZERO(req->protocolVersion); + for (i = 0; iprotocolVersion, i); - *req->maximumRecordSize = 1024*1024; - *req->preferredMessageSize = 1024*1024; + *req->maximumRecordSize = 1024*kilobytes; + *req->preferredMessageSize = 1024*kilobytes; req->idAuthentication = auth; - send_apdu(apdu); - printf("Sent initrequest.\n"); + req->referenceId = set_refid(out); + + if (yazProxy && type_and_host) + { + yaz_oi_set_string_oid(&req->otherInfo, out, yaz_oid_userinfo_proxy, + 1, type_and_host); + } + + if (negotiationCharset || yazLang) { + Z_OtherInformation **p; + Z_OtherInformationUnit *p0; + + yaz_oi_APDU(apdu, &p); + + if ((p0=yaz_oi_update(p, out, NULL, 0, 0))) + { + ODR_MASK_SET(req->options, Z_Options_negotiationModel); + + p0->which = Z_OtherInfo_externallyDefinedInfo; + p0->information.externallyDefinedInfo = + yaz_set_proposal_charneg_list(out, ",", + negotiationCharset, + yazLang, + negotiationCharsetRecords); + } + } + if (send_apdu(apdu)) + printf("Sent initrequest.\n"); +} + + +/* These two are used only from process_initResponse() */ +static void render_initUserInfo(Z_OtherInformation *ui1); +static void render_diag(Z_DiagnosticFormat *diag); + +static void pr_opt(const char *opt, void *clientData) +{ + printf(" %s", opt); } static int process_initResponse(Z_InitResponse *res) { + int ver = 0; /* save session parameters for later use */ session_mem = odr_extract_mem(in); - session = res; + session_initResponse = res; + + for (ver = 0; ver < 8; ver++) + if (!ODR_MASK_GET(res->protocolVersion, ver)) + break; if (!*res->result) - printf("Connection rejected by target.\n"); + printf("Connection rejected by v%d target.\n", ver); else - printf("Connection accepted by target.\n"); + printf("Connection accepted by v%d target.\n", ver); if (res->implementationId) printf("ID : %s\n", res->implementationId); if (res->implementationName) @@ -557,319 +400,565 @@ static int process_initResponse(Z_InitResponse *res) printf("Version: %s\n", res->implementationVersion); if (res->userInformationField) { - printf("UserInformationfield:\n"); - if (!z_External(print, (Z_External**)&res-> userInformationField, - 0, 0)) - { - odr_perror(print, "Printing userinfo\n"); + Z_External *uif = res->userInformationField; + if (uif->which == Z_External_userInfo1) { + render_initUserInfo(uif->u.userInfo1); + } else { + printf("UserInformationfield:\n"); + if (!z_External(print, (Z_External**)&uif, 0, 0)) + { + odr_perror(print, "Printing userinfo\n"); + odr_reset(print); + } + if (uif->which == Z_External_octet) { + printf("Guessing visiblestring:\n"); + printf("'%.*s'\n", uif->u.octet_aligned->len, + uif->u.octet_aligned->buf); + } + else if (uif->which == Z_External_single) + { + Odr_any *sat = uif->u.single_ASN1_type; + if (!oid_oidcmp(uif->direct_reference, + yaz_oid_userinfo_oclc_userinfo)) + { + Z_OCLC_UserInformation *oclc_ui; + ODR decode = odr_createmem(ODR_DECODE); + odr_setbuf(decode, (char *) sat->buf, sat->len, 0); + if (!z_OCLC_UserInformation(decode, &oclc_ui, 0, 0)) + printf("Bad OCLC UserInformation:\n"); + else + printf("OCLC UserInformation:\n"); + if (!z_OCLC_UserInformation(print, &oclc_ui, 0, 0)) + printf("Bad OCLC UserInformation spec\n"); + odr_destroy(decode); + } + else + { + /* Peek at any private Init-diagnostic APDUs */ + printf("yaz-client ignoring unrecognised userInformationField: %d-octet External '%.*s'\n", + (int) sat->len, sat->len, sat->buf); + } + } odr_reset(print); } - if (res->userInformationField->which == Z_External_octet) - { - printf("Guessing visiblestring:\n"); - printf("'%s'\n", res->userInformationField->u. octet_aligned->buf); - } - odr_reset (print); - } - printf ("Options:"); - if (ODR_MASK_GET(res->options, Z_Options_search)) - printf (" search"); - if (ODR_MASK_GET(res->options, Z_Options_present)) - printf (" present"); - if (ODR_MASK_GET(res->options, Z_Options_delSet)) - printf (" delSet"); - if (ODR_MASK_GET(res->options, Z_Options_resourceReport)) - printf (" resourceReport"); - if (ODR_MASK_GET(res->options, Z_Options_resourceCtrl)) - printf (" resourceCtrl"); - if (ODR_MASK_GET(res->options, Z_Options_accessCtrl)) - printf (" accessCtrl"); - if (ODR_MASK_GET(res->options, Z_Options_scan)) - printf (" scan"); - if (ODR_MASK_GET(res->options, Z_Options_sort)) - printf (" sort"); - if (ODR_MASK_GET(res->options, Z_Options_extendedServices)) - printf (" extendedServices"); - if (ODR_MASK_GET(res->options, Z_Options_level_1Segmentation)) - printf (" level1Segmentation"); - if (ODR_MASK_GET(res->options, Z_Options_level_2Segmentation)) - printf (" level2Segmentation"); - if (ODR_MASK_GET(res->options, Z_Options_concurrentOperations)) - printf (" concurrentOperations"); + } + printf("Options:"); + yaz_init_opt_decode(res->options, pr_opt, 0); + printf("\n"); + if (ODR_MASK_GET(res->options, Z_Options_namedResultSets)) - printf (" namedResultSets"); - printf ("\n"); - fflush (stdout); + setnumber = 0; + + if (ODR_MASK_GET(res->options, Z_Options_negotiationModel)) { + + Z_CharSetandLanguageNegotiation *p = + yaz_get_charneg_record(res->otherInfo); + + if (p) + { + char *charset=NULL, *lang=NULL; + int selected; + + yaz_get_response_charneg(session_mem, p, &charset, &lang, + &selected); + + printf("Accepted character set : %s\n", charset ? charset:"none"); + printf("Accepted code language : %s\n", lang ? lang:"none"); + printf("Accepted records in ...: %d\n", selected ); + + if (outputCharset && charset) + { + printf("Converting between %s and %s\n", + outputCharset, charset); + odr_set_charset(out, charset, outputCharset); + odr_set_charset(in, outputCharset, charset); + cmd_querycharset(charset); + } + else + { + odr_set_charset(out, 0, 0); + odr_set_charset(in, 0, 0); + } + } + } + fflush(stdout); return 0; } -static int cmd_base(char *arg) -{ + +static void render_initUserInfo(Z_OtherInformation *ui1) { + int i; + printf("Init response contains %d otherInfo unit%s:\n", + ui1->num_elements, ui1->num_elements == 1 ? "" : "s"); + + for (i = 0; i < ui1->num_elements; i++) { + Z_OtherInformationUnit *unit = ui1->list[i]; + printf(" %d: otherInfo unit contains ", i+1); + if (unit->which == Z_OtherInfo_externallyDefinedInfo && + unit->information.externallyDefinedInfo && + unit->information.externallyDefinedInfo->which == + Z_External_diag1) { + render_diag(unit->information.externallyDefinedInfo->u.diag1); + } + else if (unit->which != Z_OtherInfo_externallyDefinedInfo) + { + printf("unsupported otherInfo unit->which = %d\n", unit->which); + } + else + { + printf("unsupported otherInfo unit external %d\n", + unit->information.externallyDefinedInfo ? + unit->information.externallyDefinedInfo->which : -2); + } + } +} + + +/* ### should this share code with display_diagrecs()? */ +static void render_diag(Z_DiagnosticFormat *diag) { int i; - char *cp; - if (!*arg) - { - printf("Usage: base ...\n"); - return 0; + printf("%d diagnostic%s:\n", diag->num, diag->num == 1 ? "" : "s"); + for (i = 0; i < diag->num; i++) { + Z_DiagnosticFormat_s *ds = diag->elements[i]; + printf(" %d: ", i+1); + switch (ds->which) { + case Z_DiagnosticFormat_s_defaultDiagRec: { + Z_DefaultDiagFormat *dd = ds->u.defaultDiagRec; + /* ### should check `dd->diagnosticSetId' */ + printf("code=" ODR_INT_PRINTF " (%s)", *dd->condition, + diagbib1_str(*dd->condition)); + /* Both types of addinfo are the same, so use type-pun */ + if (dd->u.v2Addinfo != 0) + printf(",\n\taddinfo='%s'", dd->u.v2Addinfo); + break; + } + case Z_DiagnosticFormat_s_explicitDiagnostic: + printf("Explicit diagnostic (not supported)"); + break; + default: + printf("Unrecognised diagnostic type %d", ds->which); + break; + } + + if (ds->message != 0) + printf(", message='%s'", ds->message); + printf("\n"); } +} + + +static int set_base(const char *arg) +{ + int i; + const char *cp; + for (i = 0; i ...\n"); return 0; + } + return set_base(arg); +} + +int session_connect(const char *arg) +{ + void *add; + char type_and_host[101]; + const char *basep = 0; + if (conn) + { + cs_close(conn); + conn = 0; + } + if (session_mem) + { + nmem_destroy(session_mem); + session_mem = NULL; + session_initResponse = 0; + } + cs_get_host_args(arg, &basep); + + strncpy(type_and_host, arg, sizeof(type_and_host)-1); + type_and_host[sizeof(type_and_host)-1] = '\0'; - conn = cs_create_host(type_and_host, 1, &add); + if (yazProxy) + conn = cs_create_host(yazProxy, 1, &add); + else + conn = cs_create_host(arg, 1, &add); if (!conn) { - printf ("Couldn't create comstack\n"); - return 0; + printf("Could not resolve address %s\n", arg); + return 0; + } +#if YAZ_HAVE_XML2 +#else + if (conn->protocol == PROTO_HTTP) + { + printf("SRW/HTTP not enabled in this YAZ\n"); + cs_close(conn); + conn = 0; + return 0; } +#endif + protocol = conn->protocol; + if (conn->protocol == PROTO_HTTP) + set_base(""); + else + set_base("Default"); printf("Connecting..."); fflush(stdout); if (cs_connect(conn, add) < 0) { - printf ("error = %s\n", cs_strerror(conn)); - if (conn->cerrno == CSYSERR) - perror("system"); + printf("error = %s\n", cs_strerror(conn)); cs_close(conn); conn = 0; return 0; } - printf("Ok.\n"); - send_initRequest(); - if (*base) - cmd_base (base); - return 2; -} - -int cmd_authentication(char *arg) -{ - static Z_IdAuthentication au; - static char open[256]; - - if (!*arg) + printf("OK.\n"); + cs_print_session_info(conn); + if (basep && *basep) + set_base (basep); + if (protocol == PROTO_Z3950) { - printf("Auth field set to null\n"); - auth = 0; - return 1; + send_initRequest(type_and_host); + return 2; } - auth = &au; - au.which = Z_IdAuthentication_open; - au.u.open = open; - strcpy(open, arg); - return 1; + return 0; } -/* SEARCH SERVICE ------------------------------ */ - -static void display_variant(Z_Variant *v, int level) +int cmd_open(const char *arg) { - int i; - - for (i = 0; i < v->num_triples; i++) + int r; + if (arg) { - printf("%*sclass=%d,type=%d", level * 4, "", *v->triples[i]->zclass, - *v->triples[i]->type); - if (v->triples[i]->which == Z_Triple_internationalString) - printf(",value=%s\n", v->triples[i]->value.internationalString); - else - printf("\n"); + strncpy(cur_host, arg, sizeof(cur_host)-1); + cur_host[sizeof(cur_host)-1] = 0; } + r = session_connect(cur_host); + if (conn && conn->protocol == PROTO_HTTP) + queryType = QueryType_CQL; + return r; } -static void display_grs1(Z_GenericRecord *r, int level) +int cmd_authentication(const char *arg) { - int i; + char **args; + int r; - if (!r) - return; - for (i = 0; i < r->num_elements; i++) - { - Z_TaggedElement *t; + nmem_reset(nmem_auth); + nmem_strsplit_blank(nmem_auth, arg, &args, &r); - printf("%*s", level * 4, ""); - t = r->elements[i]; - printf("("); - if (t->tagType) - printf("%d,", *t->tagType); - else - printf("?,"); - if (t->tagValue->which == Z_StringOrNumeric_numeric) - printf("%d) ", *t->tagValue->u.numeric); - else - printf("%s) ", t->tagValue->u.string); - if (t->content->which == Z_ElementData_subtree) - { - printf("\n"); - display_grs1(t->content->u.subtree, level+1); - } - else if (t->content->which == Z_ElementData_string) - printf("%s\n", t->content->u.string); - else if (t->content->which == Z_ElementData_numeric) - printf("%d\n", *t->content->u.numeric); - else if (t->content->which == Z_ElementData_oid) + if (r == 0) + { + printf("Authentication set to null\n"); + auth = 0; + } + else if (r == 1) + { + auth = (Z_IdAuthentication *) nmem_malloc(nmem_auth, sizeof(*auth)); + if (!strcmp(args[0], "-")) { - int *ip = t->content->u.oid; - oident *oent; - - if ((oent = oid_getentbyoid(t->content->u.oid))) - printf("OID: %s\n", oent->desc); - else - { - printf("{"); - while (ip && *ip >= 0) - printf(" %d", *(ip++)); - printf(" }\n"); - } - } - else if (t->content->which == Z_ElementData_noDataRequested) - printf("[No data requested]\n"); - else if (t->content->which == Z_ElementData_elementEmpty) - printf("[Element empty]\n"); - else if (t->content->which == Z_ElementData_elementNotThere) - printf("[Element not there]\n"); + auth->which = Z_IdAuthentication_anonymous; + auth->u.anonymous = odr_nullval(); + printf("Authentication set to Anonymous\n"); + } else - printf("??????\n"); - if (t->appliedVariant) - display_variant(t->appliedVariant, level+1); - if (t->metaData && t->metaData->supportedVariants) { - int c; - - printf("%*s---- variant list\n", (level+1)*4, ""); - for (c = 0; c < t->metaData->num_supportedVariants; c++) - { - printf("%*svariant #%d\n", (level+1)*4, "", c); - display_variant(t->metaData->supportedVariants[c], level + 2); - } + auth->which = Z_IdAuthentication_open; + auth->u.open = args[0]; + printf("Authentication set to Open (%s)\n", args[0]); } } + else if (r == 2) + { + auth = (Z_IdAuthentication *) nmem_malloc(nmem_auth, sizeof(*auth)); + auth->which = Z_IdAuthentication_idPass; + auth->u.idPass = (Z_IdPass *) + nmem_malloc(nmem_auth, sizeof(*auth->u.idPass)); + auth->u.idPass->groupId = NULL; + auth->u.idPass->userId = !strcmp(args[0], "-") ? 0 : args[0]; + auth->u.idPass->password = !strcmp(args[1], "-") ? 0 : args[1]; + printf("Authentication set to User (%s), Pass (%s)\n", + args[0], args[1]); + } + else if (r == 3) + { + auth = (Z_IdAuthentication*) nmem_malloc(nmem_auth, sizeof(*auth)); + auth->which = Z_IdAuthentication_idPass; + auth->u.idPass = (Z_IdPass *) + nmem_malloc(nmem_auth, sizeof(*auth->u.idPass)); + auth->u.idPass->groupId = args[1]; + auth->u.idPass->userId = args[0]; + auth->u.idPass->password = args[2]; + printf("Authentication set to User (%s), Group (%s), Pass (%s)\n", + args[0], args[1], args[2]); + } + else + { + printf("Bad number of args to auth\n"); + auth = 0; + } + + return 1; +} + +/* SEARCH SERVICE ------------------------------ */ +static void display_record(Z_External *r); + +static void print_record(const unsigned char *buf, size_t len) +{ + size_t i = len; + print_stringn(buf, len); + /* add newline if not already added ... */ + if (i <= 0 || buf[i-1] != '\n') + printf("\n"); } -static void print_record(const unsigned char *buf, size_t len) -{ - size_t i; - for (i = 0; i= 32) || strchr ("\n\r\t\f", buf[i])) - fputc (buf[i], stdout); - else - printf ("\\X%02X", buf[i]); - /* add newline if not already added ... */ - if (i <= 0 || buf[i-1] != '\n') - fputc ('\n', stdout); -} - -static void display_record(Z_DatabaseRecord *p) +static void display_record(Z_External *r) { - Z_External *r = (Z_External*) p; - oident *ent = oid_getentbyoid(r->direct_reference); + const Odr_oid *oid = r->direct_reference; record_last = r; /* * Tell the user what we got. */ - if (r->direct_reference) + if (oid) { + oid_class oclass; + char oid_name_buf[OID_STR_MAX]; + const char *oid_name + = yaz_oid_to_string_buf(oid, &oclass, oid_name_buf); printf("Record type: "); - if (ent) - printf("%s\n", ent->desc); - else if (!odr_oid(print, &r->direct_reference, 0, 0)) - { - odr_perror(print, "print oid"); - odr_reset(print); - } + if (oid_name) + printf("%s\n", oid_name); } /* Check if this is a known, ASN.1 type tucked away in an octet string */ - if (ent && r->which == Z_External_octet) + if (r->which == Z_External_octet) { - Z_ext_typeent *type = z_ext_getentbyref(ent->value); - void *rr; + Z_ext_typeent *type = z_ext_getentbyref(r->direct_reference); + char *rr; if (type) { /* * Call the given decoder to process the record. */ - odr_setbuf(in, (char*)p->u.octet_aligned->buf, - p->u.octet_aligned->len, 0); - if (!(*type->fun)(in, (char **)&rr, 0, 0)) + odr_setbuf(in, (char*)r->u.octet_aligned->buf, + r->u.octet_aligned->len, 0); + if (!(*type->fun)(in, &rr, 0, 0)) { odr_perror(in, "Decoding constructed record."); - fprintf(stderr, "[Near %d]\n", odr_offset(in)); - fprintf(stderr, "Packet dump:\n---------\n"); - odr_dumpBER(stderr, (char*)p->u.octet_aligned->buf, - p->u.octet_aligned->len); - fprintf(stderr, "---------\n"); - exit(1); + fprintf(stdout, "[Near %ld]\n", (long) odr_offset(in)); + fprintf(stdout, "Packet dump:\n---------\n"); + odr_dumpBER(stdout, (char*)r->u.octet_aligned->buf, + r->u.octet_aligned->len); + fprintf(stdout, "---------\n"); + + /* note just ignores the error ant print the bytes form the octet_aligned later */ + } else { + /* + * Note: we throw away the original, BER-encoded record here. + * Do something else with it if you want to keep it. + */ + r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */ + r->which = type->what; } - /* - * Note: we throw away the original, BER-encoded record here. - * Do something else with it if you want to keep it. - */ - r->u.sutrs = (Z_SUTRS *) rr; /* we don't actually check the type here. */ - r->which = type->what; } } - if (ent && ent->value == VAL_SOIF) - print_record((const unsigned char *) r->u.octet_aligned->buf, r->u.octet_aligned->len); - else if (r->which == Z_External_octet && p->u.octet_aligned->len) + if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_soif)) + { + print_record((const unsigned char *) r->u.octet_aligned->buf, + r->u.octet_aligned->len); + marc_file_write((const char *) r->u.octet_aligned->buf, + r->u.octet_aligned->len); + } + else if (oid && r->which == Z_External_octet) { - const char *octet_buf = (char*)p->u.octet_aligned->buf; - if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML || - ent->value == VAL_HTML) + const char *octet_buf = (char*)r->u.octet_aligned->buf; + if (oid && (!oid_oidcmp(oid, yaz_oid_recsyn_xml) + || !oid_oidcmp(oid, yaz_oid_recsyn_xml) + || !oid_oidcmp(oid, yaz_oid_recsyn_html))) + { print_record((const unsigned char *) octet_buf, - p->u.octet_aligned->len); + r->u.octet_aligned->len); + } + else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_postscript)) + { + int size = r->u.octet_aligned->len; + if (size > 100) + size = 100; + print_record((const unsigned char *) octet_buf, size); + } else { - if (marc_display (octet_buf, NULL) <= 0) + if (oid && yaz_oid_is_iso2709(oid)) + { + const char *result; + size_t rlen; + yaz_iconv_t cd = 0; + yaz_marc_t mt = yaz_marc_create(); + const char *from = 0; + + if (marcCharset && !strcmp(marcCharset, "auto")) + { + if (!oid_oidcmp(oid, yaz_oid_recsyn_usmarc)) + { + if (octet_buf[9] == 'a') + from = "UTF-8"; + else + from = "MARC-8"; + } + else + from = "ISO-8859-1"; + } + else if (marcCharset) + from = marcCharset; + if (outputCharset && from) + { + cd = yaz_iconv_open(outputCharset, from); + printf("convert from %s to %s", from, + outputCharset); + if (!cd) + printf(" unsupported\n"); + else + { + yaz_marc_iconv(mt, cd); + printf("\n"); + } + } + + if (yaz_marc_decode_buf(mt, octet_buf, r->u.octet_aligned->len, + &result, &rlen)> 0) + { + if (fwrite(result, rlen, 1, stdout) != 1) + { + printf("write to stdout failed\n"); + } + } + else + { + printf("bad MARC. Dumping as it is:\n"); + print_record((const unsigned char*) octet_buf, + r->u.octet_aligned->len); + } + yaz_marc_destroy(mt); + if (cd) + yaz_iconv_close(cd); + } + else { - printf ("ISO2709 decoding failed, dumping record as is:\n"); print_record((const unsigned char*) octet_buf, - p->u.octet_aligned->len); + r->u.octet_aligned->len); } } - if (marcdump) - fwrite (octet_buf, 1, p->u.octet_aligned->len, marcdump); + marc_file_write(octet_buf, r->u.octet_aligned->len); } - else if (ent && ent->value == VAL_SUTRS) + else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_sutrs)) { if (r->which != Z_External_sutrs) { @@ -877,17 +966,124 @@ static void display_record(Z_DatabaseRecord *p) return; } print_record(r->u.sutrs->buf, r->u.sutrs->len); + marc_file_write((const char *) r->u.sutrs->buf, r->u.sutrs->len); } - else if (ent && ent->value == VAL_GRS1) + else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_grs_1)) { + WRBUF w; if (r->which != Z_External_grs1) { printf("Expecting single GRS type for GRS.\n"); return; } - display_grs1(r->u.grs1, 0); + w = wrbuf_alloc(); + yaz_display_grs1(w, r->u.grs1, 0); + puts(wrbuf_cstr(w)); + wrbuf_destroy(w); + } + else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_opac)) + { + int i; + if (r->u.opac->bibliographicRecord) + display_record(r->u.opac->bibliographicRecord); + for (i = 0; iu.opac->num_holdingsData; i++) + { + Z_HoldingsRecord *h = r->u.opac->holdingsData[i]; + if (h->which == Z_HoldingsRecord_marcHoldingsRecord) + { + printf("MARC holdings %d\n", i); + display_record(h->u.marcHoldingsRecord); + } + else if (h->which == Z_HoldingsRecord_holdingsAndCirc) + { + int j; + + Z_HoldingsAndCircData *data = h->u.holdingsAndCirc; + + printf("Data holdings %d\n", i); + if (data->typeOfRecord) + printf("typeOfRecord: %s\n", data->typeOfRecord); + if (data->encodingLevel) + printf("encodingLevel: %s\n", data->encodingLevel); + if (data->receiptAcqStatus) + printf("receiptAcqStatus: %s\n", data->receiptAcqStatus); + if (data->generalRetention) + printf("generalRetention: %s\n", data->generalRetention); + if (data->completeness) + printf("completeness: %s\n", data->completeness); + if (data->dateOfReport) + printf("dateOfReport: %s\n", data->dateOfReport); + if (data->nucCode) + printf("nucCode: %s\n", data->nucCode); + if (data->localLocation) + printf("localLocation: %s\n", data->localLocation); + if (data->shelvingLocation) + printf("shelvingLocation: %s\n", data->shelvingLocation); + if (data->callNumber) + printf("callNumber: %s\n", data->callNumber); + if (data->shelvingData) + printf("shelvingData: %s\n", data->shelvingData); + if (data->copyNumber) + printf("copyNumber: %s\n", data->copyNumber); + if (data->publicNote) + printf("publicNote: %s\n", data->publicNote); + if (data->reproductionNote) + printf("reproductionNote: %s\n", data->reproductionNote); + if (data->termsUseRepro) + printf("termsUseRepro: %s\n", data->termsUseRepro); + if (data->enumAndChron) + printf("enumAndChron: %s\n", data->enumAndChron); + for (j = 0; jnum_volumes; j++) + { + printf("volume %d\n", j); + if (data->volumes[j]->enumeration) + printf(" enumeration: %s\n", + data->volumes[j]->enumeration); + if (data->volumes[j]->chronology) + printf(" chronology: %s\n", + data->volumes[j]->chronology); + if (data->volumes[j]->enumAndChron) + printf(" enumAndChron: %s\n", + data->volumes[j]->enumAndChron); + } + for (j = 0; jnum_circulationData; j++) + { + printf("circulation %d\n", j); + if (data->circulationData[j]->availableNow) + printf(" availableNow: %d\n", + *data->circulationData[j]->availableNow); + if (data->circulationData[j]->availablityDate) + printf(" availabiltyDate: %s\n", + data->circulationData[j]->availablityDate); + if (data->circulationData[j]->availableThru) + printf(" availableThru: %s\n", + data->circulationData[j]->availableThru); + if (data->circulationData[j]->restrictions) + printf(" restrictions: %s\n", + data->circulationData[j]->restrictions); + if (data->circulationData[j]->itemId) + printf(" itemId: %s\n", + data->circulationData[j]->itemId); + if (data->circulationData[j]->renewable) + printf(" renewable: %d\n", + *data->circulationData[j]->renewable); + if (data->circulationData[j]->onHold) + printf(" onHold: %d\n", + *data->circulationData[j]->onHold); + if (data->circulationData[j]->enumAndChron) + printf(" enumAndChron: %s\n", + data->circulationData[j]->enumAndChron); + if (data->circulationData[j]->midspine) + printf(" midspine: %s\n", + data->circulationData[j]->midspine); + if (data->circulationData[j]->temporaryLocation) + printf(" temporaryLocation: %s\n", + data->circulationData[j]->temporaryLocation); + } + } + } } - else + else { printf("Unknown record representation.\n"); if (!z_External(print, &r, 0, 0)) @@ -898,11 +1094,9 @@ static void display_record(Z_DatabaseRecord *p) } } - static void display_diagrecs(Z_DiagRec **pp, int num) { int i; - oident *ent; Z_DefaultDiagFormat *r; printf("Diagnostic message(s) from database:\n"); @@ -916,26 +1110,30 @@ static void display_diagrecs(Z_DiagRec **pp, int num) } else r = p->u.defaultFormat; - if (!(ent = oid_getentbyoid(r->diagnosticSetId)) || - ent->oclass != CLASS_DIAGSET || ent->value != VAL_BIB1) - printf("Missing or unknown diagset\n"); - printf(" [%d] %s", *r->condition, diagbib1_str(*r->condition)); -#ifdef ASN_COMPILED + + if (!r->diagnosticSetId) + printf("Missing diagset\n"); + else + { + oid_class oclass; + char diag_name_buf[OID_STR_MAX]; + const char *diag_name = 0; + diag_name = yaz_oid_to_string_buf + (r->diagnosticSetId, &oclass, diag_name_buf); + if (oid_oidcmp(r->diagnosticSetId, yaz_oid_diagset_bib_1)) + printf("Unknown diagset: %s\n", diag_name); + } + printf(" [" ODR_INT_PRINTF "] %s", + *r->condition, diagbib1_str(*r->condition)); switch (r->which) { case Z_DefaultDiagFormat_v2Addinfo: - printf (" -- v2 addinfo '%s'\n", r->u.v2Addinfo); + printf(" -- v2 addinfo '%s'\n", r->u.v2Addinfo); break; case Z_DefaultDiagFormat_v3Addinfo: - printf (" -- v3 addinfo '%s'\n", r->u.v3Addinfo); + printf(" -- v3 addinfo '%s'\n", r->u.v3Addinfo); break; } -#else - if (r->addinfo && *r->addinfo) - printf(" -- '%s'\n", r->addinfo); - else - printf("\n"); -#endif } } @@ -956,19 +1154,15 @@ static void display_records(Z_Records *p) if (p->which == Z_Records_NSD) { -#ifdef ASN_COMPILED Z_DiagRec dr, *dr_p = &dr; dr.which = Z_DiagRec_defaultFormat; dr.u.defaultFormat = p->u.nonSurrogateDiagnostic; - display_diagrecs (&dr_p, 1); -#else - display_diagrecs (&p->u.nonSurrogateDiagnostic, 1); -#endif + display_diagrecs(&dr_p, 1); } else if (p->which == Z_Records_multipleNSD) - display_diagrecs (p->u.multipleNonSurDiagnostics->diagRecs, + display_diagrecs(p->u.multipleNonSurDiagnostics->diagRecs, p->u.multipleNonSurDiagnostics->num_diagRecs); - else + else { printf("Records: %d\n", p->u.databaseOrSurDiagnostics->num_records); for (i = 0; i < p->u.databaseOrSurDiagnostics->num_records; i++) @@ -976,7 +1170,7 @@ static void display_records(Z_Records *p) } } -static int send_deleteResultSetRequest(char *arg) +static int send_deleteResultSetRequest(const char *arg) { char names[8][32]; int i; @@ -984,51 +1178,222 @@ static int send_deleteResultSetRequest(char *arg) Z_APDU *apdu = zget_APDU(out, Z_APDU_deleteResultSetRequest); Z_DeleteResultSetRequest *req = apdu->u.deleteResultSetRequest; - req->referenceId = set_refid (out); + req->referenceId = set_refid(out); req->num_resultSetList = - sscanf (arg, "%30s %30s %30s %30s %30s %30s %30s %30s", - names[0], names[1], names[2], names[3], - names[4], names[5], names[6], names[7]); + sscanf(arg, "%30s %30s %30s %30s %30s %30s %30s %30s", + names[0], names[1], names[2], names[3], + names[4], names[5], names[6], names[7]); - req->deleteFunction = (int *) - odr_malloc (out, sizeof(*req->deleteFunction)); + req->deleteFunction = odr_intdup(out, 0); if (req->num_resultSetList > 0) { - *req->deleteFunction = Z_DeleteRequest_list; + *req->deleteFunction = Z_DeleteResultSetRequest_list; req->resultSetList = (char **) - odr_malloc (out, sizeof(*req->resultSetList)* + odr_malloc(out, sizeof(*req->resultSetList)* req->num_resultSetList); for (i = 0; inum_resultSetList; i++) req->resultSetList[i] = names[i]; } else { - *req->deleteFunction = Z_DeleteRequest_all; + *req->deleteFunction = Z_DeleteResultSetRequest_all; req->resultSetList = 0; } - + send_apdu(apdu); printf("Sent deleteResultSetRequest.\n"); return 2; } -static int send_searchRequest(char *arg) +#if YAZ_HAVE_XML2 +static int send_srw(Z_SRW_PDU *sr) +{ + const char *charset = negotiationCharset; + const char *host_port = cur_host; + Z_GDU *gdu; + char *path = 0; + + path = (char *) odr_malloc(out, 2+strlen(databaseNames[0])); + *path = '/'; + strcpy(path+1, databaseNames[0]); + + gdu = z_get_HTTP_Request_host_path(out, host_port, path); + + if (!yaz_matchstr(sru_method, "get")) + { + yaz_sru_get_encode(gdu->u.HTTP_Request, sr, out, charset); + } + else if (!yaz_matchstr(sru_method, "post")) + { + yaz_sru_post_encode(gdu->u.HTTP_Request, sr, out, charset); + } + else if (!yaz_matchstr(sru_method, "soap")) + { + yaz_sru_soap_encode(gdu->u.HTTP_Request, sr, out, charset); + } + + if (z_GDU(out, &gdu, 0, 0)) + { + /* encode OK */ + char *buf_out; + int len_out; + int r; + if (apdu_file) + { + if (!z_GDU(print, &gdu, 0, 0)) + printf("Failed to print outgoing SRU package\n"); + odr_reset(print); + } + buf_out = odr_getbuf(out, &len_out, 0); + + /* we don't odr_reset(out), since we may need the buffer again */ + + do_hex_dump(buf_out, len_out); + + r = cs_put(conn, buf_out, len_out); + + if (r >= 0) + return 2; + } + return 0; +} +#endif + +#if YAZ_HAVE_XML2 +static char *encode_SRW_term(ODR o, const char *q) +{ + const char *in_charset = "ISO-8859-1"; + WRBUF w = wrbuf_alloc(); + yaz_iconv_t cd; + char *res; + if (outputCharset) + in_charset = outputCharset; + cd = yaz_iconv_open("UTF-8", in_charset); + if (!cd) + { + wrbuf_destroy(w); + return odr_strdup(o, q); + } + wrbuf_iconv_write(w, cd, q, strlen(q)); + if (wrbuf_len(w)) + res = odr_strdup(o, wrbuf_cstr(w)); + else + res = odr_strdup(o, q); + yaz_iconv_close(cd); + wrbuf_destroy(w); + return res; +} + + +static int send_SRW_scanRequest(const char *arg, int pos, int num) +{ + Z_SRW_PDU *sr = 0; + + /* regular requestse .. */ + sr = yaz_srw_get_pdu(out, Z_SRW_scan_request, sru_version); + + switch(queryType) + { + case QueryType_CQL: + sr->u.scan_request->query_type = Z_SRW_query_type_cql; + sr->u.scan_request->scanClause.cql = encode_SRW_term(out, arg); + break; + case QueryType_Prefix: + sr->u.scan_request->query_type = Z_SRW_query_type_pqf; + sr->u.scan_request->scanClause.pqf = encode_SRW_term(out, arg); + break; + default: + printf("Only CQL and PQF supported in SRW\n"); + return 0; + } + sr->u.scan_request->responsePosition = odr_intdup(out, pos); + sr->u.scan_request->maximumTerms = odr_intdup(out, num); + return send_srw(sr); +} + +static int send_SRW_searchRequest(const char *arg) +{ + Z_SRW_PDU *sr = 0; + + if (!srw_sr) + { + assert(srw_sr_odr_out == 0); + srw_sr_odr_out = odr_createmem(ODR_ENCODE); + } + odr_reset(srw_sr_odr_out); + + setno = 1; + + /* save this for later .. when fetching individual records */ + srw_sr = yaz_srw_get_pdu(srw_sr_odr_out, Z_SRW_searchRetrieve_request, + sru_version); + + /* regular request .. */ + sr = yaz_srw_get_pdu(out, Z_SRW_searchRetrieve_request, sru_version); + + switch(queryType) + { + case QueryType_CQL: + srw_sr->u.request->query_type = Z_SRW_query_type_cql; + srw_sr->u.request->query.cql = encode_SRW_term(srw_sr_odr_out, arg); + + sr->u.request->query_type = Z_SRW_query_type_cql; + sr->u.request->query.cql = encode_SRW_term(srw_sr_odr_out, arg); + break; + case QueryType_Prefix: + srw_sr->u.request->query_type = Z_SRW_query_type_pqf; + srw_sr->u.request->query.pqf = encode_SRW_term(srw_sr_odr_out, arg); + + sr->u.request->query_type = Z_SRW_query_type_pqf; + sr->u.request->query.pqf = encode_SRW_term(srw_sr_odr_out, arg); + break; + default: + printf("Only CQL and PQF supported in SRW\n"); + return 0; + } + sr->u.request->maximumRecords = odr_intdup(out, 0); + + if (record_schema) + sr->u.request->recordSchema = record_schema; + if (recordsyntax_size == 1 && !yaz_matchstr(recordsyntax_list[0], "xml")) + sr->u.request->recordPacking = "xml"; + return send_srw(sr); +} +#endif + +static void query_charset_convert(Z_RPNQuery *q) +{ + if (queryCharset && outputCharset) + { + yaz_iconv_t cd = yaz_iconv_open(queryCharset, outputCharset); + if (!cd) + { + printf("Conversion from %s to %s unsupported\n", + outputCharset, queryCharset); + return; + } + yaz_query_charset_convert_rpnquery(q, out, cd); + yaz_iconv_close(cd); + } +} + +static int send_searchRequest(const char *arg) { Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest); Z_SearchRequest *req = apdu->u.searchRequest; Z_Query query; - int oid[OID_SIZE]; -#if CCL2RPN struct ccl_rpn_node *rpn = NULL; int error, pos; -#endif char setstring[100]; Z_RPNQuery *RPNquery; Odr_oct ccl_query; + YAZ_PQF_Parser pqf_parser; + Z_External *ext; + QueryType myQueryType = queryType; + char pqfbuf[512]; -#if CCL2RPN - if (queryType == QueryType_CCL2RPN) + if (myQueryType == QueryType_CCL2RPN) { rpn = ccl_find_str(bibset, arg, &error, &pos); if (error) @@ -1036,9 +1401,33 @@ static int send_searchRequest(char *arg) printf("CCL ERROR: %s\n", ccl_err_msg(error)); return 0; } + } else if (myQueryType == QueryType_CQL2RPN) { + /* ### All this code should be wrapped in a utility function */ + CQL_parser parser; + struct cql_node *node; + const char *addinfo; + if (cqltrans == 0) { + printf("Can't use CQL: no translation file. Try set_cqlfile\n"); + return 0; + } + parser = cql_parser_create(); + if ((error = cql_parser_string(parser, arg)) != 0) { + printf("Can't parse CQL: must be a syntax error\n"); + return 0; + } + node = cql_parser_result(parser); + if ((error = cql_transform_buf(cqltrans, node, pqfbuf, + sizeof pqfbuf)) != 0) { + error = cql_transform_error(cqltrans, &addinfo); + printf("Can't convert CQL to PQF: %s (addinfo=%s)\n", + cql_strerror(error), addinfo); + return 0; + } + arg = pqfbuf; + myQueryType = QueryType_Prefix; } -#endif - req->referenceId = set_refid (out); + + req->referenceId = set_refid(out); if (!strcmp(arg, "@big")) /* strictly for troublemaking */ { static unsigned char big[2100]; @@ -1050,7 +1439,7 @@ static int send_searchRequest(char *arg) bigo.buf = big; req->referenceId = &bigo; } - + if (setnumber >= 0) { sprintf(setstring, "%d", ++setnumber); @@ -1062,13 +1451,11 @@ static int send_searchRequest(char *arg) if (smallSetUpperBound > 0 || (largeSetLowerBound > 1 && mediumSetPresentNumber > 0)) { - oident prefsyn; + if (recordsyntax_size) + req->preferredRecordSyntax = + yaz_string_to_oid_odr(yaz_oid_std(), + CLASS_RECSYN, recordsyntax_list[0], out); - prefsyn.proto = protocol; - prefsyn.oclass = CLASS_RECSYN; - prefsyn.value = recordsyntax; - req->preferredRecordSyntax = - odr_oiddup(out, oid_ent_to_oid(&prefsyn, oid)); req->smallSetElementSetNames = req->mediumSetElementSetNames = elementSetNames; } @@ -1077,16 +1464,26 @@ static int send_searchRequest(char *arg) req->query = &query; - switch (queryType) + switch (myQueryType) { case QueryType_Prefix: query.which = Z_Query_type_1; - RPNquery = p_query_rpn (out, protocol, arg); + pqf_parser = yaz_pqf_create(); + RPNquery = yaz_pqf_parse(pqf_parser, out, arg); if (!RPNquery) { - printf("Prefix query error\n"); + const char *pqf_msg; + size_t off; + int code = yaz_pqf_error(pqf_parser, &pqf_msg, &off); + int ioff = off; + printf("%*s^\n", ioff+4, ""); + printf("Prefix query error: %s (code %d)\n", pqf_msg, code); + + yaz_pqf_destroy(pqf_parser); return 0; } + yaz_pqf_destroy(pqf_parser); + query_charset_convert(RPNquery); query.u.type_1 = RPNquery; break; case QueryType_CCL: @@ -1095,41 +1492,143 @@ static int send_searchRequest(char *arg) ccl_query.buf = (unsigned char*) arg; ccl_query.len = strlen(arg); break; -#if CCL2RPN case QueryType_CCL2RPN: query.which = Z_Query_type_1; RPNquery = ccl_rpn_query(out, rpn); if (!RPNquery) { - printf ("Couldn't convert from CCL to RPN\n"); + printf("Couldn't convert from CCL to RPN\n"); return 0; } + query_charset_convert(RPNquery); query.u.type_1 = RPNquery; - ccl_rpn_delete (rpn); + ccl_rpn_delete(rpn); + break; + case QueryType_CQL: + query.which = Z_Query_type_104; + ext = (Z_External *) odr_malloc(out, sizeof(*ext)); + ext->direct_reference = odr_getoidbystr(out, "1.2.840.10003.16.2"); + ext->indirect_reference = 0; + ext->descriptor = 0; + ext->which = Z_External_CQL; + ext->u.cql = odr_strdup(out, arg); + query.u.type_104 = ext; break; -#endif default: - printf ("Unsupported query type\n"); + printf("Unsupported query type\n"); return 0; } - send_apdu(apdu); + if (send_apdu(apdu)) + printf("Sent searchRequest.\n"); setno = 1; - printf("Sent searchRequest.\n"); return 2; } +/* display Query Expression as part of searchResult-1 */ +static void display_queryExpression(const char *lead, Z_QueryExpression *qe) +{ + if (!qe) + return; + printf(" %s=", lead); + if (qe->which == Z_QueryExpression_term) + { + if (qe->u.term->queryTerm) + { + Z_Term *term = qe->u.term->queryTerm; + switch (term->which) + { + case Z_Term_general: + printf("%.*s", term->u.general->len, term->u.general->buf); + break; + case Z_Term_characterString: + printf("%s", term->u.characterString); + break; + case Z_Term_numeric: + printf(ODR_INT_PRINTF, *term->u.numeric); + break; + case Z_Term_null: + printf("null"); + break; + } + } + } +} + +/* see if we can find USR:SearchResult-1 */ +static void display_searchResult(Z_OtherInformation *o) +{ + int i; + if (!o) + return ; + for (i = 0; i < o->num_elements; i++) + { + if (o->list[i]->which == Z_OtherInfo_externallyDefinedInfo) + { + Z_External *ext = o->list[i]->information.externallyDefinedInfo; + + if (ext->which == Z_External_searchResult1) + { + int j; + Z_SearchInfoReport *sr = ext->u.searchResult1; + printf("SearchResult-1:"); + for (j = 0; j < sr->num; j++) + { + if (j) + printf(","); + if (!sr->elements[j]->subqueryExpression) + printf("%d", j); + display_queryExpression("term", + sr->elements[j]->subqueryExpression); + display_queryExpression("interpretation", + sr->elements[j]->subqueryInterpretation); + display_queryExpression("recommendation", + sr->elements[j]->subqueryRecommendation); + if (sr->elements[j]->subqueryCount) + printf(" cnt=" ODR_INT_PRINTF, + *sr->elements[j]->subqueryCount); + if (sr->elements[j]->subqueryId) + printf(" id=%s ", sr->elements[j]->subqueryId); + } + printf("\n"); + } + } + } +} + static int process_searchResponse(Z_SearchResponse *res) { - printf ("Received SearchResponse.\n"); - print_refid (res->referenceId); + printf("Received SearchResponse.\n"); + print_refid(res->referenceId); if (*res->searchStatus) printf("Search was a success.\n"); else printf("Search was a bloomin' failure.\n"); - printf("Number of hits: %d, setno %d\n", - *res->resultCount, setnumber); - printf("records returned: %d\n", - *res->numberOfRecordsReturned); + printf("Number of hits: " ODR_INT_PRINTF, *res->resultCount); + last_hit_count = *res->resultCount; + if (setnumber >= 0) + printf(", setno %d", setnumber); + putchar('\n'); + if (res->resultSetStatus) + { + printf("Result Set Status: "); + switch(*res->resultSetStatus) + { + case Z_SearchResponse_subset: + printf("subset"); break; + case Z_SearchResponse_interim: + printf("interim"); break; + case Z_SearchResponse_none: + printf("none"); break; + case Z_SearchResponse_estimate: + printf("estimate"); break; + default: + printf(ODR_INT_PRINTF, *res->resultSetStatus); + } + putchar('\n'); + } + display_searchResult(res->additionalSearchInfo); + printf("records returned: " ODR_INT_PRINTF "\n", + *res->numberOfRecordsReturned); setno += *res->numberOfRecordsReturned; if (res->records) display_records(res->records); @@ -1143,7 +1642,16 @@ static void print_level(int iLevel) printf(" "); } -static void print_int(int iLevel, const char *pTag, int *pInt) +static void print_int(int iLevel, const char *pTag, Odr_int *pInt) +{ + if (pInt != NULL) + { + print_level(iLevel); + printf("%s: " ODR_INT_PRINTF "\n", pTag, *pInt); + } +} + +static void print_bool(int iLevel, const char *pTag, Odr_bool *pInt) { if (pInt != NULL) { @@ -1165,7 +1673,7 @@ static void print_oid(int iLevel, const char *pTag, Odr_oid *pOid) { if (pOid != NULL) { - int *pInt = pOid; + Odr_oid *pInt = pOid; print_level(iLevel); printf("%s:", pTag); @@ -1195,41 +1703,47 @@ static void print_string_or_numeric(int iLevel, const char *pTag, Z_StringOrNume { switch (pStringNumeric->which) { - case Z_StringOrNumeric_string: - print_string(iLevel, pTag, pStringNumeric->u.string); - break; + case Z_StringOrNumeric_string: + print_string(iLevel, pTag, pStringNumeric->u.string); + break; - case Z_StringOrNumeric_numeric: - print_int(iLevel, pTag, pStringNumeric->u.numeric); - break; + case Z_StringOrNumeric_numeric: + print_int(iLevel, pTag, pStringNumeric->u.numeric); + break; - default: - print_level(iLevel); - printf("%s: valid type for Z_StringOrNumeric\n", pTag); - break; + default: + print_level(iLevel); + printf("%s: valid type for Z_StringOrNumeric\n", pTag); + break; } } } -static void print_universe_report_duplicate(int iLevel, Z_UniverseReportDuplicate *pUniverseReportDuplicate) +static void print_universe_report_duplicate( + int iLevel, + Z_UniverseReportDuplicate *pUniverseReportDuplicate) { if (pUniverseReportDuplicate != NULL) { print_level(iLevel); printf("Universe Report Duplicate: \n"); iLevel++; - print_string_or_numeric(iLevel, "Hit No", pUniverseReportDuplicate->hitno); + print_string_or_numeric(iLevel, "Hit No", + pUniverseReportDuplicate->hitno); } } -static void print_universe_report_hits(int iLevel, Z_UniverseReportHits *pUniverseReportHits) +static void print_universe_report_hits( + int iLevel, + Z_UniverseReportHits *pUniverseReportHits) { if (pUniverseReportHits != NULL) { print_level(iLevel); printf("Universe Report Hits: \n"); iLevel++; - print_string_or_numeric(iLevel, "Database", pUniverseReportHits->database); + print_string_or_numeric(iLevel, "Database", + pUniverseReportHits->database); print_string_or_numeric(iLevel, "Hits", pUniverseReportHits->hits); } } @@ -1244,18 +1758,20 @@ static void print_universe_report(int iLevel, Z_UniverseReport *pUniverseReport) print_int(iLevel, "Total Hits", pUniverseReport->totalHits); switch (pUniverseReport->which) { - case Z_UniverseReport_databaseHits: - print_universe_report_hits(iLevel, pUniverseReport->u.databaseHits); - break; + case Z_UniverseReport_databaseHits: + print_universe_report_hits(iLevel, + pUniverseReport->u.databaseHits); + break; - case Z_UniverseReport_duplicate: - print_universe_report_duplicate(iLevel, pUniverseReport->u.duplicate); - break; + case Z_UniverseReport_duplicate: + print_universe_report_duplicate(iLevel, + pUniverseReport->u.duplicate); + break; - default: - print_level(iLevel); - printf("Type: %d\n", pUniverseReport->which); - break; + default: + print_level(iLevel); + printf("Type: %d\n", pUniverseReport->which); + break; } } } @@ -1272,73 +1788,149 @@ static void print_external(int iLevel, Z_External *pExternal) print_string(iLevel, "Descriptor", pExternal->descriptor); switch (pExternal->which) { - case Z_External_universeReport: - print_universe_report(iLevel, pExternal->u.universeReport); - break; + case Z_External_universeReport: + print_universe_report(iLevel, pExternal->u.universeReport); + break; - default: - print_level(iLevel); - printf("Type: %d\n", pExternal->which); - break; + default: + print_level(iLevel); + printf("Type: %d\n", pExternal->which); + break; } } } -static int process_resourceControlRequest (Z_ResourceControlRequest *req) +static int process_resourceControlRequest(Z_ResourceControlRequest *req) { - printf ("Received ResourceControlRequest.\n"); + printf("Received ResourceControlRequest.\n"); print_referenceId(1, req->referenceId); - print_int(1, "Suspended Flag", req->suspendedFlag); + print_bool(1, "Suspended Flag", req->suspendedFlag); print_int(1, "Partial Results Available", req->partialResultsAvailable); - print_int(1, "Response Required", req->responseRequired); - print_int(1, "Triggered Request Flag", req->triggeredRequestFlag); + print_bool(1, "Response Required", req->responseRequired); + print_bool(1, "Triggered Request Flag", req->triggeredRequestFlag); print_external(1, req->resourceReport); return 0; } void process_ESResponse(Z_ExtendedServicesResponse *res) { - printf("process_ESResponse status="); + printf("Status: "); switch (*res->operationStatus) { case Z_ExtendedServicesResponse_done: - printf ("done\n"); + printf("done\n"); break; case Z_ExtendedServicesResponse_accepted: - printf ("accepted\n"); + printf("accepted\n"); break; case Z_ExtendedServicesResponse_failure: - printf ("failure\n"); + printf("failure\n"); display_diagrecs(res->diagnostics, res->num_diagnostics); break; + default: + printf("unknown\n"); } -} + if ( (*res->operationStatus != Z_ExtendedServicesResponse_failure) && + (res->num_diagnostics != 0) ) { + display_diagrecs(res->diagnostics, res->num_diagnostics); + } + print_refid (res->referenceId); + if (res->taskPackage && + res->taskPackage->which == Z_External_extendedService) + { + Z_TaskPackage *taskPackage = res->taskPackage->u.extendedService; + Odr_oct *id = taskPackage->targetReference; + Z_External *ext = taskPackage->taskSpecificParameters; -#ifdef ASN_COMPILED + if (id) + { + printf("Target Reference: "); + print_stringn (id->buf, id->len); + printf("\n"); + } + if (ext->which == Z_External_update) + { + Z_IUUpdateTaskPackage *utp = ext->u.update->u.taskPackage; + if (utp && utp->targetPart) + { + Z_IUTargetPart *targetPart = utp->targetPart; + int i; -const char *get_ill_element (void *clientData, const char *element) -{ - printf ("%s\n", element); - return 0; -} + for (i = 0; inum_taskPackageRecords; i++) + { -static Z_External *create_external_itemRequest() -{ - struct ill_get_ctl ctl; - ILL_ItemRequest *req; - Z_External *r = 0; - int item_request_size = 0; - char *item_request_buf = 0; + Z_IUTaskPackageRecordStructure *tpr = + targetPart->taskPackageRecords[i]; + printf("task package record %d\n", i+1); + if (tpr->which == Z_IUTaskPackageRecordStructure_record) + { + display_record (tpr->u.record); + } + else + { + printf("other type\n"); + } + } + } + } + if (ext->which == Z_External_itemOrder) + { + Z_IOTaskPackage *otp = ext->u.itemOrder->u.taskPackage; - ctl.odr = out; - ctl.clientData = 0; - ctl.f = get_ill_element; + if (otp && otp->targetPart) + { + if (otp->targetPart->itemRequest) + { + Z_External *ext = otp->targetPart->itemRequest; + if (ext->which == Z_External_octet) + { + Odr_oct *doc = ext->u.octet_aligned; + printf("Got itemRequest doc %.*s\n", + doc->len, doc->buf); + } + } + else if (otp->targetPart->statusOrErrorReport) + { + Z_External *ext = otp->targetPart->statusOrErrorReport; + if (ext->which == Z_External_octet) + { + Odr_oct *doc = ext->u.octet_aligned; + printf("Got Status or Error Report doc %.*s\n", + doc->len, doc->buf); + } + } + } + } + } + if (res->taskPackage && res->taskPackage->which == Z_External_octet) + { + Odr_oct *doc = res->taskPackage->u.octet_aligned; + printf("%.*s\n", doc->len, doc->buf); + } +} + +const char *get_ill_element(void *clientData, const char *element) +{ + return 0; +} + +static Z_External *create_external_itemRequest(void) +{ + struct ill_get_ctl ctl; + ILL_ItemRequest *req; + Z_External *r = 0; + int item_request_size = 0; + char *item_request_buf = 0; + + ctl.odr = out; + ctl.clientData = 0; + ctl.f = get_ill_element; req = ill_get_ItemRequest(&ctl, "ill", 0); if (!req) - printf ("ill_get_ItemRequest failed\n"); - - if (!ill_ItemRequest (out, &req, 0, 0)) + printf("ill_get_ItemRequest failed\n"); + + if (!ill_ItemRequest(out, &req, 0, 0)) { if (apdu_file) { @@ -1348,44 +1940,31 @@ static Z_External *create_external_itemRequest() item_request_buf = odr_getbuf (out, &item_request_size, 0); if (item_request_buf) odr_setbuf (out, item_request_buf, item_request_size, 1); - printf ("Couldn't encode ItemRequest, size %d\n", item_request_size); + printf("Couldn't encode ItemRequest, size %d\n", item_request_size); return 0; } else { - oident oid; - - item_request_buf = odr_getbuf (out, &item_request_size, 0); - oid.proto = PROTO_GENERAL; - oid.oclass = CLASS_GENERAL; - oid.value = VAL_ISO_ILL_1; - - r = (Z_External *) odr_malloc (out, sizeof(*r)); - r->direct_reference = odr_oiddup(out,oid_getoidbyent(&oid)); + r = (Z_External *) odr_malloc(out, sizeof(*r)); + r->direct_reference = odr_oiddup(out, yaz_oid_general_isoill_1); r->indirect_reference = 0; r->descriptor = 0; r->which = Z_External_single; - + r->u.single_ASN1_type = (Odr_oct *) - odr_malloc (out, sizeof(*r->u.single_ASN1_type)); + odr_malloc(out, sizeof(*r->u.single_ASN1_type)); r->u.single_ASN1_type->buf = (unsigned char *) - odr_malloc (out, item_request_size); + odr_malloc(out, item_request_size); r->u.single_ASN1_type->len = item_request_size; r->u.single_ASN1_type->size = item_request_size; - memcpy (r->u.single_ASN1_type->buf, item_request_buf, + memcpy(r->u.single_ASN1_type->buf, item_request_buf, item_request_size); - printf ("len = %d\n", item_request_size); + + do_hex_dump(item_request_buf,item_request_size); } return r; } -#else -static Z_External *create_external_itemRequest() -{ - return 0; -} -#endif -#ifdef ASN_COMPILED static Z_External *create_external_ILL_APDU(int which) { struct ill_get_ctl ctl; @@ -1393,7 +1972,7 @@ static Z_External *create_external_ILL_APDU(int which) Z_External *r = 0; int ill_request_size = 0; char *ill_request_buf = 0; - + ctl.odr = out; ctl.clientData = 0; ctl.f = get_ill_element; @@ -1404,61 +1983,49 @@ static Z_External *create_external_ILL_APDU(int which) { if (apdu_file) { - printf ("-------------------\n"); + printf("-------------------\n"); ill_APDU(print, &ill_apdu, 0, 0); odr_reset(print); - printf ("-------------------\n"); + printf("-------------------\n"); } ill_request_buf = odr_getbuf (out, &ill_request_size, 0); if (ill_request_buf) odr_setbuf (out, ill_request_buf, ill_request_size, 1); - printf ("Couldn't encode ILL-Request, size %d\n", ill_request_size); + printf("Couldn't encode ILL-Request, size %d\n", ill_request_size); return 0; } else { - oident oid; ill_request_buf = odr_getbuf (out, &ill_request_size, 0); - - oid.proto = PROTO_GENERAL; - oid.oclass = CLASS_GENERAL; - oid.value = VAL_ISO_ILL_1; - - r = (Z_External *) odr_malloc (out, sizeof(*r)); - r->direct_reference = odr_oiddup(out,oid_getoidbyent(&oid)); + + r = (Z_External *) odr_malloc(out, sizeof(*r)); + r->direct_reference = odr_oiddup(out, yaz_oid_general_isoill_1); r->indirect_reference = 0; r->descriptor = 0; r->which = Z_External_single; - + r->u.single_ASN1_type = (Odr_oct *) - odr_malloc (out, sizeof(*r->u.single_ASN1_type)); + odr_malloc(out, sizeof(*r->u.single_ASN1_type)); r->u.single_ASN1_type->buf = (unsigned char *) - odr_malloc (out, ill_request_size); + odr_malloc(out, ill_request_size); r->u.single_ASN1_type->len = ill_request_size; r->u.single_ASN1_type->size = ill_request_size; - memcpy (r->u.single_ASN1_type->buf, ill_request_buf, ill_request_size); - printf ("len = %d\n", ill_request_size); + memcpy(r->u.single_ASN1_type->buf, ill_request_buf, ill_request_size); +/* printf("len = %d\n", ill_request_size); */ +/* do_hex_dump(ill_request_buf,ill_request_size); */ +/* printf("--- end of extenal\n"); */ + } return r; } -#else -static Z_External *create_external_ILLRequest() -{ - return 0; -} -#endif -static Z_External *create_ItemOrderExternal(const char *type, int itemno) +static Z_External *create_ItemOrderExternal(const char *type, int itemno, + const char *xml_buf, + int xml_len) { Z_External *r = (Z_External *) odr_malloc(out, sizeof(Z_External)); - oident ItemOrderRequest; - - ItemOrderRequest.proto = PROTO_Z3950; - ItemOrderRequest.oclass = CLASS_EXTSERV; - ItemOrderRequest.value = VAL_ITEMORDER; - - r->direct_reference = odr_oiddup(out,oid_getoidbyent(&ItemOrderRequest)); + r->direct_reference = odr_oiddup(out, yaz_oid_extserv_item_order); r->indirect_reference = 0; r->descriptor = 0; @@ -1466,13 +2033,9 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) r->u.itemOrder = (Z_ItemOrder *) odr_malloc(out,sizeof(Z_ItemOrder)); memset(r->u.itemOrder, 0, sizeof(Z_ItemOrder)); -#ifdef ASN_COMPILED r->u.itemOrder->which=Z_IOItemOrder_esRequest; -#else - r->u.itemOrder->which=Z_ItemOrder_esRequest; -#endif - r->u.itemOrder->u.esRequest = (Z_IORequest *) + r->u.itemOrder->u.esRequest = (Z_IORequest *) odr_malloc(out,sizeof(Z_IORequest)); memset(r->u.itemOrder->u.esRequest, 0, sizeof(Z_IORequest)); @@ -1493,266 +2056,693 @@ static Z_External *create_ItemOrderExternal(const char *type, int itemno) r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->resultSetId = "1"; r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = - (int *) odr_malloc(out, sizeof(int)); - *r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno; - -#ifdef ASN_COMPILED + odr_intdup(out, itemno); if (!strcmp (type, "item") || !strcmp(type, "2")) { - printf ("using item-request\n"); - r->u.itemOrder->u.esRequest->notToKeep->itemRequest = + printf("using item-request\n"); + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = create_external_itemRequest(); } else if (!strcmp(type, "ill") || !strcmp(type, "1")) { - printf ("using ILL-request\n"); - r->u.itemOrder->u.esRequest->notToKeep->itemRequest = + printf("using ILL-request\n"); + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = create_external_ILL_APDU(ILL_APDU_ILL_Request); } + else if (!strcmp(type, "xml") || !strcmp(type, "3")) + { + printf("using XML ILL-request\n"); + + if (!xml_buf) + { + printf("no docoument added\n"); + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0; + } + else + { + r->u.itemOrder->u.esRequest->notToKeep->itemRequest = + z_ext_record_oid(out, yaz_oid_recsyn_xml, xml_buf, xml_len); + } + } else r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0; -#else - r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0; -#endif return r; } -static int send_itemorder(const char *type, int itemno) +static int send_itemorder(const char *type, int itemno, + const char *xml_buf, int xml_len) { Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest); Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest; - oident ItemOrderRequest; - ItemOrderRequest.proto = PROTO_Z3950; - ItemOrderRequest.oclass = CLASS_EXTSERV; - ItemOrderRequest.value = VAL_ITEMORDER; - req->packageType = odr_oiddup(out,oid_getoidbyent(&ItemOrderRequest)); - req->packageName = esPackageName; + req->referenceId = set_refid (out); - req->taskSpecificParameters = create_ItemOrderExternal(type, itemno); + req->packageType = odr_oiddup(out, yaz_oid_extserv_item_order); + req->packageName = esPackageName; + req->taskSpecificParameters = create_ItemOrderExternal(type, itemno, + xml_buf, xml_len); send_apdu(apdu); return 0; } -static int cmd_update(char *arg) +static int only_z3950(void) { - Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest ); - Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest; - Z_External *r; - int oid[OID_SIZE]; - Z_IUOriginPartToKeep *toKeep; - Z_IUSuppliedRecords *notToKeep; - oident update_oid; - printf ("Update request\n"); - fflush(stdout); - - if (!record_last) - return 0; - update_oid.proto = PROTO_Z3950; - update_oid.oclass = CLASS_EXTSERV; - update_oid.value = VAL_DBUPDATE; - oid_ent_to_oid (&update_oid, oid); - req->packageType = odr_oiddup(out,oid); - req->packageName = esPackageName; + if (!conn) + { + printf("Not connected yet\n"); + return 1; + } + if (protocol == PROTO_HTTP) + { + printf("Not supported by SRW\n"); + return 1; + } + return 0; +} - r = req->taskSpecificParameters = (Z_External *) - odr_malloc (out, sizeof(*r)); - r->direct_reference = odr_oiddup(out,oid); - r->indirect_reference = 0; - r->descriptor = 0; - r->which = Z_External_update; - r->u.update = (Z_IUUpdate *) odr_malloc(out, sizeof(*r->u.update)); - r->u.update->which = Z_IUUpdate_esRequest; - r->u.update->u.esRequest = (Z_IUUpdateEsRequest *) - odr_malloc(out, sizeof(*r->u.update->u.esRequest)); - toKeep = r->u.update->u.esRequest->toKeep = (Z_IUOriginPartToKeep *) - odr_malloc(out, sizeof(*r->u.update->u.esRequest->toKeep)); - toKeep->databaseName = databaseNames[0]; - toKeep->schema = 0; - toKeep->elementSetName = 0; - toKeep->actionQualifier = 0; - toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action)); - *toKeep->action = Z_IUOriginPartToKeep_recordInsert; - - notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *) - odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep)); - notToKeep->num = 1; - notToKeep->elements = (Z_IUSuppliedRecords_elem **) - odr_malloc(out, sizeof(*notToKeep->elements)); - notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *) - odr_malloc(out, sizeof(**notToKeep->elements)); - notToKeep->elements[0]->u.number = 0; - notToKeep->elements[0]->supplementalId = 0; - notToKeep->elements[0]->correlationInfo = 0; - notToKeep->elements[0]->record = record_last; - - send_apdu(apdu); +static int cmd_update_common(const char *arg, int version); - return 2; +static int cmd_update(const char *arg) +{ + return cmd_update_common(arg, 1); } -/* II : Added to do DALI Item Order Extended services request */ -static int cmd_itemorder(char *arg) +static int cmd_update0(const char *arg) { - char type[12]; - int itemno; + return cmd_update_common(arg, 0); +} - if (sscanf (arg, "%10s %d", type, &itemno) != 2) - return 0; +static int cmd_update_Z3950(int version, int action_no, const char *recid, + char *rec_buf, int rec_len); - printf("Item order request\n"); - fflush(stdout); - send_itemorder(type, itemno); - return(2); -} +#if YAZ_HAVE_XML2 +static int cmd_update_SRW(int action_no, const char *recid, + char *rec_buf, int rec_len); +#endif -static int cmd_find(char *arg) +static int cmd_update_common(const char *arg, int version) { - if (!*arg) + char *action_buf; + int action_len; + char *recid_buf; + int recid_len; + const char *recid = 0; + char *rec_buf; + int rec_len; + int action_no; + int noread = 0; + + if (parse_cmd_doc(&arg, out, &action_buf, &action_len) == 0) { - printf("Find what?\n"); + printf("Use: update action recid [fname]\n"); + printf(" where action is one of insert,replace,delete.update\n"); + printf(" recid is some record ID. Use none for no ID\n"); + printf(" fname is file of record to be updated\n"); return 0; } - if (!conn) + + if (parse_cmd_doc(&arg, out, &recid_buf, &recid_len) == 0) { - printf("Not connected yet\n"); + printf("Missing recid\n"); return 0; } - if (!send_searchRequest(arg)) + + if (!strcmp(action_buf, "insert")) + action_no = Z_IUOriginPartToKeep_recordInsert; + else if (!strcmp(action_buf, "replace")) + action_no = Z_IUOriginPartToKeep_recordReplace; + else if (!strcmp(action_buf, "delete")) + action_no = Z_IUOriginPartToKeep_recordDelete; + else if (!strcmp(action_buf, "update")) + action_no = Z_IUOriginPartToKeep_specialUpdate; + else + { + printf("Bad action: %s\n", action_buf); + printf("Possible values: insert, replace, delete, update\n"); return 0; - return 2; + } + + if (strcmp(recid_buf, "none")) /* none means no record ID */ + recid = recid_buf; + + arg += noread; + if (parse_cmd_doc(&arg, out, &rec_buf, &rec_len) == 0) + return 0; + +#if YAZ_HAVE_XML2 + if (protocol == PROTO_HTTP) + return cmd_update_SRW(action_no, recid_buf, rec_buf, rec_len); +#endif + return cmd_update_Z3950(version, action_no, recid_buf, rec_buf, rec_len); } -static int cmd_delete(char *arg) +#if YAZ_HAVE_XML2 +static int cmd_update_SRW(int action_no, const char *recid, + char *rec_buf, int rec_len) { if (!conn) - { - printf("Not connected yet\n"); + session_connect(cur_host); + if (!conn) return 0; + else + { + Z_SRW_PDU *srw = yaz_srw_get(out, Z_SRW_update_request); + Z_SRW_updateRequest *sr = srw->u.update_request; + + switch(action_no) + { + case Z_IUOriginPartToKeep_recordInsert: + sr->operation = "info:srw/action/1/create"; + break; + case Z_IUOriginPartToKeep_recordReplace: + sr->operation = "info:srw/action/1/replace"; + break; + case Z_IUOriginPartToKeep_recordDelete: + sr->operation = "info:srw/action/1/delete"; + break; + } + if (rec_buf) + { + sr->record = yaz_srw_get_record(out); + sr->record->recordData_buf = rec_buf; + sr->record->recordData_len = rec_len; + sr->record->recordSchema = record_schema; + } + if (recid) + sr->recordId = odr_strdup(out, recid); + return send_srw(srw); } - if (!send_deleteResultSetRequest(arg)) - return 0; +} +#endif + +static int cmd_update_Z3950(int version, int action_no, const char *recid, + char *rec_buf, int rec_len) +{ + Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest ); + Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest; + Z_External *r; + Z_External *record_this = 0; + if (rec_buf) + record_this = z_ext_record_oid(out, yaz_oid_recsyn_xml, + rec_buf, rec_len); + else + { + if (!record_last) + { + printf("No last record (update ignored)\n"); + return 0; + } + record_this = record_last; + } + + req->packageType = odr_oiddup(out, (version == 0 ? + yaz_oid_extserv_database_update_first_version : + yaz_oid_extserv_database_update)); + + req->packageName = esPackageName; + + req->referenceId = set_refid (out); + + r = req->taskSpecificParameters = (Z_External *) + odr_malloc(out, sizeof(*r)); + r->direct_reference = req->packageType; + r->indirect_reference = 0; + r->descriptor = 0; + if (version == 0) + { + Z_IU0OriginPartToKeep *toKeep; + Z_IU0SuppliedRecords *notToKeep; + + r->which = Z_External_update0; + r->u.update0 = (Z_IU0Update *) odr_malloc(out, sizeof(*r->u.update0)); + r->u.update0->which = Z_IUUpdate_esRequest; + r->u.update0->u.esRequest = (Z_IU0UpdateEsRequest *) + odr_malloc(out, sizeof(*r->u.update0->u.esRequest)); + toKeep = r->u.update0->u.esRequest->toKeep = (Z_IU0OriginPartToKeep *) + odr_malloc(out, sizeof(*r->u.update0->u.esRequest->toKeep)); + + toKeep->databaseName = databaseNames[0]; + toKeep->schema = 0; + if (record_schema) + { + toKeep->schema = yaz_string_to_oid_odr(yaz_oid_std(), + CLASS_SCHEMA, + record_schema, out); + } + toKeep->elementSetName = 0; + + toKeep->action = odr_intdup(out, action_no); + + notToKeep = r->u.update0->u.esRequest->notToKeep = (Z_IU0SuppliedRecords *) + odr_malloc(out, sizeof(*r->u.update0->u.esRequest->notToKeep)); + notToKeep->num = 1; + notToKeep->elements = (Z_IU0SuppliedRecords_elem **) + odr_malloc(out, sizeof(*notToKeep->elements)); + notToKeep->elements[0] = (Z_IU0SuppliedRecords_elem *) + odr_malloc(out, sizeof(**notToKeep->elements)); + notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque; + if (recid) + { + notToKeep->elements[0]->u.opaque = (Odr_oct *) + odr_malloc(out, sizeof(Odr_oct)); + notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid; + notToKeep->elements[0]->u.opaque->size = strlen(recid); + notToKeep->elements[0]->u.opaque->len = strlen(recid); + } + else + notToKeep->elements[0]->u.opaque = 0; + notToKeep->elements[0]->supplementalId = 0; + notToKeep->elements[0]->correlationInfo = 0; + notToKeep->elements[0]->record = record_this; + } + else + { + Z_IUOriginPartToKeep *toKeep; + Z_IUSuppliedRecords *notToKeep; + + r->which = Z_External_update; + r->u.update = (Z_IUUpdate *) odr_malloc(out, sizeof(*r->u.update)); + r->u.update->which = Z_IUUpdate_esRequest; + r->u.update->u.esRequest = (Z_IUUpdateEsRequest *) + odr_malloc(out, sizeof(*r->u.update->u.esRequest)); + toKeep = r->u.update->u.esRequest->toKeep = (Z_IUOriginPartToKeep *) + odr_malloc(out, sizeof(*r->u.update->u.esRequest->toKeep)); + + toKeep->databaseName = databaseNames[0]; + toKeep->schema = 0; + if (record_schema) + { + toKeep->schema = yaz_string_to_oid_odr(yaz_oid_std(), + CLASS_SCHEMA, + record_schema, out); + } + toKeep->elementSetName = 0; + toKeep->actionQualifier = 0; + toKeep->action = odr_intdup(out, action_no); + + notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *) + odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep)); + notToKeep->num = 1; + notToKeep->elements = (Z_IUSuppliedRecords_elem **) + odr_malloc(out, sizeof(*notToKeep->elements)); + notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *) + odr_malloc(out, sizeof(**notToKeep->elements)); + notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque; + if (recid) + { + notToKeep->elements[0]->u.opaque = (Odr_oct *) + odr_malloc(out, sizeof(Odr_oct)); + notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid; + notToKeep->elements[0]->u.opaque->size = strlen(recid); + notToKeep->elements[0]->u.opaque->len = strlen(recid); + } + else + notToKeep->elements[0]->u.opaque = 0; + notToKeep->elements[0]->supplementalId = 0; + notToKeep->elements[0]->correlationInfo = 0; + notToKeep->elements[0]->record = record_this; + } + + send_apdu(apdu); + return 2; } -static int cmd_ssub(char *arg) +static int cmd_xmles(const char *arg) { - if (!(smallSetUpperBound = atoi(arg))) - return 0; - return 1; + if (only_z3950()) + return 1; + else + { + char *asn_buf = 0; + int noread = 0; + Odr_oid *oid; + char oid_str[51]; + Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest); + Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest; + + + Z_External *ext = (Z_External *) odr_malloc(out, sizeof(*ext)); + + req->referenceId = set_refid (out); + req->taskSpecificParameters = ext; + ext->indirect_reference = 0; + ext->descriptor = 0; + ext->which = Z_External_octet; + ext->u.single_ASN1_type = (Odr_oct *) odr_malloc(out, sizeof(Odr_oct)); + sscanf(arg, "%50s%n", oid_str, &noread); + if (noread == 0) + { + printf("Missing OID for xmles\n"); + return 0; + } + arg += noread; + if (parse_cmd_doc(&arg, out, &asn_buf, + &ext->u.single_ASN1_type->len) == 0) + return 0; + + ext->u.single_ASN1_type->buf = (unsigned char *) asn_buf; + + oid = yaz_string_to_oid_odr(yaz_oid_std(), + CLASS_EXTSERV, oid_str, out); + if (!oid) + { + printf("Bad OID: %s\n", oid_str); + return 0; + } + + req->packageType = oid; + + ext->direct_reference = oid; + + send_apdu(apdu); + + return 2; + } } -static int cmd_lslb(char *arg) +static int cmd_itemorder(const char *arg) { - if (!(largeSetLowerBound = atoi(arg))) + char type[12]; + int itemno; + char *xml_buf = 0; + int xml_len = 0; + int no_read = 0; + + if (only_z3950()) + return 1; + if (sscanf(arg, "%10s %d%n", type, &itemno, &no_read) < 2) return 0; - return 1; + arg += no_read; + parse_cmd_doc(&arg, out, &xml_buf, &xml_len); + + fflush(stdout); + send_itemorder(type, itemno, xml_buf, xml_len); + return 2; } -static int cmd_mspn(char *arg) +static void show_opt(const char *arg, void *clientData) { - if (!(mediumSetPresentNumber = atoi(arg))) - return 0; - return 1; + printf("%s ", arg); } -static int cmd_status(char *arg) +static int cmd_zversion(const char *arg) { - printf("smallSetUpperBound: %d\n", smallSetUpperBound); - printf("largeSetLowerBound: %d\n", largeSetLowerBound); - printf("mediumSetPresentNumber: %d\n", mediumSetPresentNumber); - return 1; + if (*arg && arg) + z3950_version = atoi(arg); + else + printf("version is %d\n", z3950_version); + return 0; } -static int cmd_setnames(char *arg) +static int cmd_options(const char *arg) { - if (setnumber < 0) + if (*arg) { - printf("Set numbering enabled.\n"); - setnumber = 0; + int r; + int pos; + r = yaz_init_opt_encode(&z3950_options, arg, &pos); + if (r == -1) + printf("Unknown option(s) near %s\n", arg+pos); } else { - printf("Set numbering disabled.\n"); - setnumber = -1; + yaz_init_opt_decode(&z3950_options, show_opt, 0); + printf("\n"); } - return 1; + return 0; } -/* PRESENT SERVICE ----------------------------- */ - -static int send_presentRequest(char *arg) +static int cmd_explain(const char *arg) { - Z_APDU *apdu = zget_APDU(out, Z_APDU_presentRequest); - Z_PresentRequest *req = apdu->u.presentRequest; - Z_RecordComposition compo; - oident prefsyn; - int nos = 1; - int oid[OID_SIZE]; - char *p; - char setstring[100]; - - req->referenceId = set_refid (out); - if ((p = strchr(arg, '+'))) + if (protocol != PROTO_HTTP) + return 0; +#if YAZ_HAVE_XML2 + if (!conn) + session_connect(cur_host); + if (conn) { - nos = atoi(p + 1); - *p = 0; + Z_SRW_PDU *sr = 0; + + setno = 1; + + /* save this for later .. when fetching individual records */ + sr = yaz_srw_get(out, Z_SRW_explain_request); + if (recordsyntax_size == 1 + && !yaz_matchstr(recordsyntax_list[0], "xml")) + sr->u.explain_request->recordPacking = "xml"; + send_srw(sr); + return 2; } +#endif + return 0; +} + +static int cmd_init(const char *arg) +{ if (*arg) - setno = atoi(arg); - if (p && (p=strchr(p+1, '+'))) { - strcpy (setstring, p+1); - req->resultSetId = setstring; + strncpy(cur_host, arg, sizeof(cur_host)-1); + cur_host[sizeof(cur_host)-1] = 0; } - else if (setnumber >= 0) + if (only_z3950()) + return 1; + send_initRequest(cur_host); + return 2; +} + +static int cmd_sru(const char *arg) +{ + if (!*arg) { - sprintf(setstring, "%d", setnumber); - req->resultSetId = setstring; + printf("SRU method is: %s\n", sru_method); + printf("SRU version is: %s\n", sru_version); } -#if 0 - if (1) + else { - static Z_Range range; - static Z_Range *rangep = ⦥ - req->num_ranges = 1; -#endif - req->resultSetStartPoint = &setno; - req->numberOfRecordsRequested = &nos; - prefsyn.proto = protocol; - prefsyn.oclass = CLASS_RECSYN; - prefsyn.value = recordsyntax; - req->preferredRecordSyntax = - odr_oiddup (out, oid_ent_to_oid(&prefsyn, oid)); + int r; + r = sscanf(arg, "%9s %9s", sru_method, sru_version); + if (r >= 1) + { + if (!yaz_matchstr(sru_method, "post")) + ; + else if (!yaz_matchstr(sru_method, "get")) + ; + else if (!yaz_matchstr(sru_method, "soap")) + ; + else + { + strcpy(sru_method, "soap"); + printf("Unknown SRU method: %s\n", arg); + printf("Specify one of POST, GET, SOAP\n"); + } + } + } + return 0; +} - if (schema != VAL_NONE) +static int cmd_find(const char *arg) +{ + if (!*arg) { - oident prefschema; + printf("Find what?\n"); + return 0; + } + if (protocol == PROTO_HTTP) + { +#if YAZ_HAVE_XML2 + if (!conn) + session_connect(cur_host); + if (!conn) + return 0; + if (!send_SRW_searchRequest(arg)) + return 0; +#else + return 0; +#endif + } + else + { + if (*cur_host && auto_reconnect) + { + int i = 0; + for (;;) + { + if (conn) + { + if (!send_searchRequest(arg)) + return 0; + wait_and_handle_response(0); + if (conn) + break; + } + if (++i == 2) + { + printf("Unable to reconnect\n"); + break; + } + session_connect(cur_host); + wait_and_handle_response(0); + } + return 0; + } + else if (conn) + { + if (!send_searchRequest(arg)) + return 0; + } + else + { + printf("Not connected yet\n"); + return 0; + } + } + return 2; +} + +static int cmd_delete(const char *arg) +{ + if (only_z3950()) + return 0; + if (!send_deleteResultSetRequest(arg)) + return 0; + return 2; +} + +static int cmd_ssub(const char *arg) +{ + if (!(smallSetUpperBound = atoi(arg))) + return 0; + return 1; +} + +static int cmd_lslb(const char *arg) +{ + if (!(largeSetLowerBound = atoi(arg))) + return 0; + return 1; +} + +static int cmd_mspn(const char *arg) +{ + if (!(mediumSetPresentNumber = atoi(arg))) + return 0; + return 1; +} + +static int cmd_status(const char *arg) +{ + printf("smallSetUpperBound: %d\n", smallSetUpperBound); + printf("largeSetLowerBound: %d\n", largeSetLowerBound); + printf("mediumSetPresentNumber: %d\n", mediumSetPresentNumber); + return 1; +} + +static int cmd_setnames(const char *arg) +{ + if (*arg == '1') /* enable ? */ + setnumber = 0; + else if (*arg == '0') /* disable ? */ + setnumber = -1; + else if (setnumber < 0) /* no args, toggle .. */ + setnumber = 0; + else + setnumber = -1; + + if (setnumber >= 0) + printf("Set numbering enabled.\n"); + else + printf("Set numbering disabled.\n"); + return 1; +} + +/* PRESENT SERVICE ----------------------------- */ + +static void parse_show_args(const char *arg_c, char *setstring, + Odr_int *start, Odr_int *number) +{ + char arg[40]; + char *p; + + strncpy(arg, arg_c, sizeof(arg)-1); + arg[sizeof(arg)-1] = '\0'; + + if ((p = strchr(arg, '+'))) + { + *number = atoi(p + 1); + *p = '\0'; + } + if (*arg) + { + if (!strcmp(arg, "all")) + { + *number = last_hit_count; + *start = 1; + } + else + *start = atoi(arg); + } + if (p && (p=strchr(p+1, '+'))) + strcpy(setstring, p+1); + else if (setnumber >= 0) + sprintf(setstring, "%d", setnumber); + else + *setstring = '\0'; +} + +static int send_presentRequest(const char *arg) +{ + Z_APDU *apdu = zget_APDU(out, Z_APDU_presentRequest); + Z_PresentRequest *req = apdu->u.presentRequest; + Z_RecordComposition compo; + Odr_int nos = 1; + char setstring[100]; - prefschema.proto = protocol; - prefschema.oclass = CLASS_SCHEMA; - prefschema.value = schema; + req->referenceId = set_refid(out); + parse_show_args(arg, setstring, &setno, &nos); + if (*setstring) + req->resultSetId = setstring; + + req->resultSetStartPoint = &setno; + req->numberOfRecordsRequested = &nos; + + if (recordsyntax_size) + req->preferredRecordSyntax = + yaz_string_to_oid_odr(yaz_oid_std(), + CLASS_RECSYN, recordsyntax_list[0], out); + + if (record_schema || recordsyntax_size >= 2) + { req->recordComposition = &compo; compo.which = Z_RecordComp_complex; compo.u.complex = (Z_CompSpec *) odr_malloc(out, sizeof(*compo.u.complex)); - compo.u.complex->selectAlternativeSyntax = (bool_t *) + compo.u.complex->selectAlternativeSyntax = (bool_t *) odr_malloc(out, sizeof(bool_t)); *compo.u.complex->selectAlternativeSyntax = 0; compo.u.complex->generic = (Z_Specification *) odr_malloc(out, sizeof(*compo.u.complex->generic)); - compo.u.complex->generic->schema = (Odr_oid *) - odr_oiddup(out, oid_ent_to_oid(&prefschema, oid)); - if (!compo.u.complex->generic->schema) + + compo.u.complex->generic->which = Z_Schema_oid; + if (!record_schema) + compo.u.complex->generic->schema.oid = 0; + else { - /* OID wasn't a schema! Try record syntax instead. */ - prefschema.oclass = CLASS_RECSYN; - compo.u.complex->generic->schema = (Odr_oid *) - odr_oiddup(out, oid_ent_to_oid(&prefschema, oid)); + compo.u.complex->generic->schema.oid = + yaz_string_to_oid_odr(yaz_oid_std(), + CLASS_SCHEMA, record_schema, out); + + if (!compo.u.complex->generic->schema.oid) + { + /* OID wasn't a schema! Try record syntax instead. */ + compo.u.complex->generic->schema.oid = (Odr_oid *) + yaz_string_to_oid_odr(yaz_oid_std(), + CLASS_RECSYN, record_schema, out); + } } if (!elementSetNames) compo.u.complex->generic->elementSpec = 0; @@ -1767,8 +2757,20 @@ static int send_presentRequest(char *arg) } compo.u.complex->num_dbSpecific = 0; compo.u.complex->dbSpecific = 0; + compo.u.complex->num_recordSyntax = 0; compo.u.complex->recordSyntax = 0; + if (recordsyntax_size >= 2) + { + int i; + compo.u.complex->num_recordSyntax = recordsyntax_size; + compo.u.complex->recordSyntax = (Odr_oid **) + odr_malloc(out, recordsyntax_size * sizeof(Odr_oid*)); + for (i = 0; i < recordsyntax_size; i++) + compo.u.complex->recordSyntax[i] = + yaz_string_to_oid_odr(yaz_oid_std(), + CLASS_RECSYN, recordsyntax_list[i], out); + } } else if (elementSetNames) { @@ -1777,10 +2779,43 @@ static int send_presentRequest(char *arg) compo.u.simple = elementSetNames; } send_apdu(apdu); - printf("Sent presentRequest (%d+%d).\n", setno, nos); + printf("Sent presentRequest (" ODR_INT_PRINTF "+" ODR_INT_PRINTF ").\n", + setno, nos); return 2; } +#if YAZ_HAVE_XML2 +static int send_SRW_presentRequest(const char *arg) +{ + char setstring[100]; + Odr_int nos = 1; + Z_SRW_PDU *sr = srw_sr; + + if (!sr) + return 0; + parse_show_args(arg, setstring, &setno, &nos); + sr->u.request->startRecord = odr_intdup(out, setno); + sr->u.request->maximumRecords = odr_intdup(out, nos); + if (record_schema) + sr->u.request->recordSchema = record_schema; + if (recordsyntax_size == 1 && !yaz_matchstr(recordsyntax_list[0], "xml")) + sr->u.request->recordPacking = "xml"; + return send_srw(sr); +} +#endif + +static void close_session(void) +{ + if (conn) + cs_close(conn); + conn = 0; + sent_close = 0; + odr_reset(out); + odr_reset(in); + odr_reset(print); + last_hit_count = 0; +} + void process_close(Z_Close *req) { Z_APDU *apdu = zget_APDU(out, Z_APDU_close); @@ -1803,16 +2838,7 @@ void process_close(Z_Close *req) printf("Reason: %s, message: %s\n", reasons[*req->closeReason], req->diagnosticInformation ? req->diagnosticInformation : "NULL"); if (sent_close) - { - cs_close (conn); - conn = NULL; - if (session_mem) - { - nmem_destroy (session_mem); - session_mem = NULL; - } - sent_close = 0; - } + close_session(); else { *res->closeReason = Z_Close_finished; @@ -1822,88 +2848,149 @@ void process_close(Z_Close *req) } } -static int cmd_show(char *arg) +static int cmd_show(const char *arg) { - if (!conn) + if (protocol == PROTO_HTTP) { - printf("Not connected yet\n"); +#if YAZ_HAVE_XML2 + if (!conn) + session_connect(cur_host); + if (!conn) + return 0; + if (!send_SRW_presentRequest(arg)) + return 0; +#else return 0; +#endif + } + else + { + if (!conn) + { + printf("Not connected yet\n"); + return 0; + } + if (!send_presentRequest(arg)) + return 0; } - if (!send_presentRequest(arg)) - return 0; return 2; } -int cmd_quit(char *arg) +void exit_client(int code) +{ + file_history_save(file_history); + file_history_destroy(&file_history); + nmem_destroy(nmem_auth); + exit(code); +} + +int cmd_quit(const char *arg) { printf("See you later, alligator.\n"); - exit(0); + xmalloc_trav(""); + exit_client(0); return 0; } -int cmd_cancel(char *arg) +int cmd_cancel(const char *arg) { Z_APDU *apdu = zget_APDU(out, Z_APDU_triggerResourceControlRequest); Z_TriggerResourceControlRequest *req = apdu->u.triggerResourceControlRequest; bool_t rfalse = 0; - - if (!conn) - { - printf("Session not initialized yet\n"); + char command[16]; + + *command = '\0'; + sscanf(arg, "%15s", command); + + if (only_z3950()) return 0; - } - if (!ODR_MASK_GET(session->options, Z_Options_triggerResourceCtrl)) + if (session_initResponse && + !ODR_MASK_GET(session_initResponse->options, + Z_Options_triggerResourceCtrl)) { printf("Target doesn't support cancel (trigger resource ctrl)\n"); return 0; } - *req->requestedAction = Z_TriggerResourceCtrl_cancel; + *req->requestedAction = Z_TriggerResourceControlRequest_cancel; req->resultSetWanted = &rfalse; + req->referenceId = set_refid(out); send_apdu(apdu); printf("Sent cancel request\n"); - return 2; + if (!strcmp(command, "wait")) + return 2; + return 1; +} + + +int cmd_cancel_find(const char *arg) { + int fres; + fres=cmd_find(arg); + if( fres > 0 ) { + return cmd_cancel(""); + }; + return fres; } -int send_scanrequest(const char *query, int pp, int num, const char *term) +int send_scanrequest(const char *set, const char *query, + Odr_int pp, Odr_int num, const char *term) { Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest); Z_ScanRequest *req = apdu->u.scanRequest; - int use_rpn = 1; - int oid[OID_SIZE]; - -#if CCL2RPN + + if (only_z3950()) + return 0; if (queryType == QueryType_CCL2RPN) { - oident bib1; int error, pos; struct ccl_rpn_node *rpn; - rpn = ccl_find_str (bibset, query, &error, &pos); + rpn = ccl_find_str(bibset, query, &error, &pos); if (error) { printf("CCL ERROR: %s\n", ccl_err_msg(error)); return -1; } - use_rpn = 0; - bib1.proto = PROTO_Z3950; - bib1.oclass = CLASS_ATTSET; - bib1.value = VAL_BIB1; - req->attributeSet = oid_ent_to_oid (&bib1, oid); - if (!(req->termListAndStartPoint = ccl_scan_query (out, rpn))) + req->attributeSet = + yaz_string_to_oid_odr(yaz_oid_std(), + CLASS_ATTSET, "Bib-1", out); + if (!(req->termListAndStartPoint = ccl_scan_query(out, rpn))) { printf("Couldn't convert CCL to Scan term\n"); return -1; } - ccl_rpn_delete (rpn); + ccl_rpn_delete(rpn); } -#endif - if (use_rpn && !(req->termListAndStartPoint = - p_query_scan(out, protocol, &req->attributeSet, query))) + else { - printf("Prefix query error\n"); - return -1; + YAZ_PQF_Parser pqf_parser = yaz_pqf_create(); + + if (!(req->termListAndStartPoint = + yaz_pqf_scan(pqf_parser, out, &req->attributeSet, query))) + { + const char *pqf_msg; + size_t off; + int code = yaz_pqf_error(pqf_parser, &pqf_msg, &off); + int ioff = off; + printf("%*s^\n", ioff+7, ""); + printf("Prefix query error: %s (code %d)\n", pqf_msg, code); + yaz_pqf_destroy(pqf_parser); + return -1; + } + yaz_pqf_destroy(pqf_parser); + } + if (queryCharset && outputCharset) + { + yaz_iconv_t cd = yaz_iconv_open(queryCharset, outputCharset); + if (!cd) + { + printf("Conversion from %s to %s unsupported\n", + outputCharset, queryCharset); + return -1; + } + yaz_query_charset_convert_apt(req->termListAndStartPoint, out, cd); + yaz_iconv_close(cd); } if (term && *term) { @@ -1918,155 +3005,52 @@ int send_scanrequest(const char *query, int pp, int num, const char *term) strlen(term); } } - req->referenceId = set_refid (out); + req->referenceId = set_refid(out); req->num_databaseNames = num_databaseNames; req->databaseNames = databaseNames; req->numberOfTermsRequested = # req->preferredPositionInResponse = &pp; + req->stepSize = odr_intdup(out, scan_stepSize); + + if (set) + yaz_oi_set_string_oid(&req->otherInfo, out, + yaz_oid_userinfo_scan_set, 1, set); + send_apdu(apdu); return 2; } -int send_sortrequest(char *arg, int newset) +int send_sortrequest(const char *arg, int newset) { Z_APDU *apdu = zget_APDU(out, Z_APDU_sortRequest); Z_SortRequest *req = apdu->u.sortRequest; Z_SortKeySpecList *sksl = (Z_SortKeySpecList *) - odr_malloc (out, sizeof(*sksl)); + odr_malloc(out, sizeof(*sksl)); char setstring[32]; - char sort_string_buf[32], sort_flags[32]; - int off; - int oid[OID_SIZE]; - oident bib1; + if (only_z3950()) + return 0; if (setnumber >= 0) - sprintf (setstring, "%d", setnumber); + sprintf(setstring, "%d", setnumber); else - sprintf (setstring, "default"); + sprintf(setstring, "default"); - req->referenceId = set_refid (out); + req->referenceId = set_refid(out); -#ifdef ASN_COMPILED req->num_inputResultSetNames = 1; req->inputResultSetNames = (Z_InternationalString **) - odr_malloc (out, sizeof(*req->inputResultSetNames)); - req->inputResultSetNames[0] = odr_strdup (out, setstring); -#else - req->inputResultSetNames = - (Z_StringList *)odr_malloc (out, sizeof(*req->inputResultSetNames)); - req->inputResultSetNames->num_strings = 1; - req->inputResultSetNames->strings = - (char **)odr_malloc (out, sizeof(*req->inputResultSetNames->strings)); - req->inputResultSetNames->strings[0] = - odr_strdup (out, setstring); -#endif + odr_malloc(out, sizeof(*req->inputResultSetNames)); + req->inputResultSetNames[0] = odr_strdup(out, setstring); if (newset && setnumber >= 0) - sprintf (setstring, "%d", ++setnumber); - - req->sortedResultSetName = odr_strdup (out, setstring); - - req->sortSequence = sksl; - sksl->num_specs = 0; - sksl->specs = (Z_SortKeySpec **)odr_malloc (out, sizeof(sksl->specs) * 20); - - bib1.proto = protocol; - bib1.oclass = CLASS_ATTSET; - bib1.value = VAL_BIB1; - while ((sscanf (arg, "%31s %31s%n", sort_string_buf, sort_flags, &off)) == 2 - && off > 1) - { - int i; - char *sort_string_sep; - char *sort_string = sort_string_buf; - Z_SortKeySpec *sks = (Z_SortKeySpec *)odr_malloc (out, sizeof(*sks)); - Z_SortKey *sk = (Z_SortKey *)odr_malloc (out, sizeof(*sk)); - - arg += off; - sksl->specs[sksl->num_specs++] = sks; - sks->sortElement = (Z_SortElement *)odr_malloc (out, sizeof(*sks->sortElement)); - sks->sortElement->which = Z_SortElement_generic; - sks->sortElement->u.generic = sk; - - if ((sort_string_sep = strchr (sort_string, '='))) - { - int i = 0; - sk->which = Z_SortKey_sortAttributes; - sk->u.sortAttributes = - (Z_SortAttributes *)odr_malloc (out, sizeof(*sk->u.sortAttributes)); - sk->u.sortAttributes->id = oid_ent_to_oid(&bib1, oid); - sk->u.sortAttributes->list = - (Z_AttributeList *)odr_malloc (out, sizeof(*sk->u.sortAttributes->list)); - sk->u.sortAttributes->list->attributes = - (Z_AttributeElement **) - odr_malloc (out, 10 * - sizeof(*sk->u.sortAttributes->list->attributes)); - while (i < 10 && sort_string && sort_string_sep) - { - Z_AttributeElement *el = (Z_AttributeElement *) - odr_malloc (out, sizeof(*el)); - sk->u.sortAttributes->list->attributes[i] = el; - el->attributeSet = 0; - el->attributeType = (int *)odr_malloc (out, sizeof(*el->attributeType)); - *el->attributeType = atoi (sort_string); - el->which = Z_AttributeValue_numeric; - el->value.numeric = (int *)odr_malloc (out, sizeof(*el->value.numeric)); - *el->value.numeric = atoi (sort_string_sep + 1); - i++; - sort_string = strchr(sort_string, ','); - if (sort_string) - { - sort_string++; - sort_string_sep = strchr (sort_string, '='); - } - } - sk->u.sortAttributes->list->num_attributes = i; - } - else - { - sk->which = Z_SortKey_sortField; - sk->u.sortField = odr_strdup (out, sort_string); - } - sks->sortRelation = (int *)odr_malloc (out, sizeof(*sks->sortRelation)); - *sks->sortRelation = Z_SortRelation_ascending; - sks->caseSensitivity = (int *)odr_malloc (out, sizeof(*sks->caseSensitivity)); - *sks->caseSensitivity = Z_SortCase_caseSensitive; + sprintf(setstring, "%d", ++setnumber); -#ifdef ASN_COMPILED - sks->which = Z_SortKeySpec_null; - sks->u.null = odr_nullval (); -#else - sks->missingValueAction = NULL; -#endif + req->sortedResultSetName = odr_strdup(out, setstring); - for (i = 0; sort_flags[i]; i++) - { - switch (sort_flags[i]) - { - case 'a': - case 'A': - case '>': - *sks->sortRelation = Z_SortRelation_descending; - break; - case 'd': - case 'D': - case '<': - *sks->sortRelation = Z_SortRelation_ascending; - break; - case 'i': - case 'I': - *sks->caseSensitivity = Z_SortCase_caseInsensitive; - break; - case 'S': - case 's': - *sks->caseSensitivity = Z_SortCase_caseSensitive; - break; - } - } - } - if (!sksl->num_specs) + req->sortSequence = yaz_sort_spec(out, arg); + if (!req->sortSequence) { - printf ("Missing sort specifications\n"); + printf("Missing sort specifications\n"); return -1; } send_apdu(apdu); @@ -2075,18 +3059,20 @@ int send_sortrequest(char *arg, int newset) void display_term(Z_TermInfo *t) { - if (t->term->which == Z_Term_general) - { + if (t->displayTerm) + printf("%s", t->displayTerm); + else if (t->term->which == Z_Term_general) printf("%.*s", t->term->u.general->len, t->term->u.general->buf); - sprintf(last_scan_line, "%.*s", t->term->u.general->len, - t->term->u.general->buf); - } else printf("Term (not general)"); + if (t->term->which == Z_Term_general) + sprintf(last_scan_line, "%.*s", t->term->u.general->len, + t->term->u.general->buf); + if (t->globalOccurrences) - printf (" (%d)\n", *t->globalOccurrences); + printf(" (" ODR_INT_PRINTF ")\n", *t->globalOccurrences); else - printf ("\n"); + printf("\n"); } void process_scanResponse(Z_ScanResponse *res) @@ -2094,15 +3080,15 @@ void process_scanResponse(Z_ScanResponse *res) int i; Z_Entry **entries = NULL; int num_entries = 0; - - printf("Received ScanResponse\n"); - print_refid (res->referenceId); - printf("%d entries", *res->numberOfEntriesReturned); + + printf("Received ScanResponse\n"); + print_refid(res->referenceId); + printf(ODR_INT_PRINTF " entries", *res->numberOfEntriesReturned); if (res->positionOfTerm) - printf (", position=%d", *res->positionOfTerm); - printf ("\n"); + printf(", position=" ODR_INT_PRINTF, *res->positionOfTerm); + printf("\n"); if (*res->scanStatus != Z_Scan_success) - printf("Scan returned code %d\n", *res->scanStatus); + printf("Scan returned code " ODR_INT_PRINTF "\n", *res->scanStatus); if (!res->entries) return; if ((entries = res->entries->entries)) @@ -2119,7 +3105,7 @@ void process_scanResponse(Z_ScanResponse *res) display_diagrecs(&entries[i]->u.surrogateDiagnostic, 1); } if (res->entries->nonsurrogateDiagnostics) - display_diagrecs (res->entries->nonsurrogateDiagnostics, + display_diagrecs(res->entries->nonsurrogateDiagnostics, res->entries->num_nonsurrogateDiagnostics); } @@ -2128,51 +3114,44 @@ void process_sortResponse(Z_SortResponse *res) printf("Received SortResponse: status="); switch (*res->sortStatus) { - case Z_SortStatus_success: - printf ("success"); break; - case Z_SortStatus_partial_1: - printf ("partial"); break; - case Z_SortStatus_failure: - printf ("failure"); break; + case Z_SortResponse_success: + printf("success"); break; + case Z_SortResponse_partial_1: + printf("partial"); break; + case Z_SortResponse_failure: + printf("failure"); break; default: - printf ("unknown (%d)", *res->sortStatus); + printf("unknown (" ODR_INT_PRINTF ")", *res->sortStatus); } - printf ("\n"); + printf("\n"); print_refid (res->referenceId); -#ifdef ASN_COMPILED if (res->diagnostics) display_diagrecs(res->diagnostics, res->num_diagnostics); -#else - if (res->diagnostics) - display_diagrecs(res->diagnostics->diagRecs, - res->diagnostics->num_diagRecs); -#endif } -void process_deleteResultSetResponse (Z_DeleteResultSetResponse *res) +void process_deleteResultSetResponse(Z_DeleteResultSetResponse *res) { - printf("Got deleteResultSetResponse status=%d\n", + printf("Got deleteResultSetResponse status=" ODR_INT_PRINTF "\n", *res->deleteOperationStatus); if (res->deleteListStatuses) { int i; for (i = 0; i < res->deleteListStatuses->num; i++) { - printf ("%s status=%d\n", res->deleteListStatuses->elements[i]->id, - *res->deleteListStatuses->elements[i]->status); + printf("%s status=" ODR_INT_PRINTF "\n", + res->deleteListStatuses->elements[i]->id, + *res->deleteListStatuses->elements[i]->status); } } } -int cmd_sort_generic(char *arg, int newset) +int cmd_sort_generic(const char *arg, int newset) { - if (!conn) - { - printf("Session not initialized yet\n"); + if (only_z3950()) return 0; - } - if (!ODR_MASK_GET(session->options, Z_Options_sort)) + if (session_initResponse && + !ODR_MASK_GET(session_initResponse->options, Z_Options_sort)) { printf("Target doesn't support sort\n"); return 0; @@ -2186,283 +3165,1701 @@ int cmd_sort_generic(char *arg, int newset) return 0; } -int cmd_sort(char *arg) +int cmd_sort(const char *arg) { - return cmd_sort_generic (arg, 0); + return cmd_sort_generic(arg, 0); } -int cmd_sort_newset (char *arg) +int cmd_sort_newset(const char *arg) { - return cmd_sort_generic (arg, 1); + return cmd_sort_generic(arg, 1); } -int cmd_scan(char *arg) +int cmd_scanstep(const char *arg) { - if (!conn) - { - printf("Session not initialized yet\n"); - return 0; - } - if (!ODR_MASK_GET(session->options, Z_Options_scan)) - { - printf("Target doesn't support scan\n"); - return 0; - } - if (*arg) - { - strcpy (last_scan_query, arg); - if (send_scanrequest(arg, 1, 20, 0) < 0) - return 0; - } - else - { - if (send_scanrequest(last_scan_query, 1, 20, last_scan_line) < 0) - return 0; - } - return 2; + scan_stepSize = atoi(arg); + return 0; } -int cmd_schema(char *arg) +int cmd_scanpos(const char *arg) { - if (!arg || !*arg) - { - schema = VAL_NONE; - return 1; - } - schema = oid_getvalbyname (arg); - if (schema == VAL_NONE) - { - printf ("unknown schema\n"); - return 0; - } - return 1; + int r = sscanf(arg, "%d", &scan_position); + if (r == 0) + scan_position = 1; + return 0; } -int cmd_format(char *arg) +int cmd_scansize(const char *arg) { - if (!arg || !*arg) - { + int r = sscanf(arg, "%d", &scan_size); + if (r == 0) + scan_size = 20; + return 0; +} + +static int cmd_scan_common(const char *set, const char *arg) +{ + if (protocol == PROTO_HTTP) + { +#if YAZ_HAVE_XML2 + if (!conn) + session_connect(cur_host); + if (!conn) + return 0; + if (*arg) + { + if (send_SRW_scanRequest(arg, scan_position, scan_size) < 0) + return 0; + } + else + { + if (send_SRW_scanRequest(last_scan_line, 1, scan_size) < 0) + return 0; + } + return 2; +#else + return 0; +#endif + } + else + { + if (*cur_host && !conn && auto_reconnect) + { + session_connect(cur_host); + wait_and_handle_response(0); + } + if (!conn) + return 0; + if (session_initResponse && + !ODR_MASK_GET(session_initResponse->options, Z_Options_scan)) + { + printf("Target doesn't support scan\n"); + return 0; + } + if (*arg) + { + strcpy(last_scan_query, arg); + if (send_scanrequest(set, arg, + scan_position, scan_size, 0) < 0) + return 0; + } + else + { + if (send_scanrequest(set, last_scan_query, + 1, scan_size, last_scan_line) < 0) + return 0; + } + return 2; + } +} + +int cmd_scan(const char *arg) +{ + return cmd_scan_common(0, arg); +} + +int cmd_setscan(const char *arg) +{ + char setstring[100]; + int nor; + if (sscanf(arg, "%99s%n", setstring, &nor) < 1) + { + printf("missing set for setscan\n"); + return 0; + } + return cmd_scan_common(setstring, arg + nor); +} + +int cmd_schema(const char *arg) +{ + xfree(record_schema); + record_schema = 0; + if (arg && *arg) + record_schema = xstrdup(arg); + return 1; +} + +int cmd_format(const char *arg) +{ + const char *cp = arg; + int nor; + int idx = 0; + int i; + char form_str[41]; + if (!arg || !*arg) + { printf("Usage: format \n"); return 0; } - recordsyntax = oid_getvalbyname (arg); - if (recordsyntax == VAL_NONE) + while (sscanf(cp, "%40s%n", form_str, &nor) >= 1 && nor > 0 + && idx < RECORDSYNTAX_MAX) + { + if (strcmp(form_str, "none") && + !yaz_string_to_oid_odr(yaz_oid_std(), CLASS_RECSYN, form_str, out)) + { + printf("Bad format: %s\n", form_str); + return 0; + } + cp += nor; + } + for (i = 0; i < recordsyntax_size; i++) + { + xfree(recordsyntax_list[i]); + recordsyntax_list[i] = 0; + } + + cp = arg; + while (sscanf(cp, "%40s%n", form_str, &nor) >= 1 && nor > 0 + && idx < RECORDSYNTAX_MAX) + { + if (!strcmp(form_str, "none")) + break; + recordsyntax_list[idx] = xstrdup(form_str); + cp += nor; + idx++; + } + recordsyntax_size = idx; + return 1; +} + +int cmd_elements(const char *arg) +{ + static Z_ElementSetNames esn; + static char what[100]; + + if (!arg || !*arg) + { + elementSetNames = 0; + return 1; + } + strcpy(what, arg); + esn.which = Z_ElementSetNames_generic; + esn.u.generic = what; + elementSetNames = &esn; + return 1; +} + +int cmd_querytype(const char *arg) +{ + if (!strcmp(arg, "ccl")) + queryType = QueryType_CCL; + else if (!strcmp(arg, "prefix") || !strcmp(arg, "rpn")) + queryType = QueryType_Prefix; + else if (!strcmp(arg, "ccl2rpn") || !strcmp(arg, "cclrpn")) + queryType = QueryType_CCL2RPN; + else if (!strcmp(arg, "cql")) + queryType = QueryType_CQL; + else if (!strcmp(arg, "cql2rpn") || !strcmp(arg, "cqlrpn")) + queryType = QueryType_CQL2RPN; + else + { + printf("Querytype must be one of:\n"); + printf(" prefix - Prefix query\n"); + printf(" ccl - CCL query\n"); + printf(" ccl2rpn - CCL query converted to RPN\n"); + printf(" cql - CQL\n"); + printf(" cql2rpn - CQL query converted to RPN\n"); + return 0; + } + return 1; +} + +int cmd_refid(const char *arg) +{ + xfree(refid); + refid = NULL; + if (*arg) + refid = xstrdup(arg); + return 1; +} + +int cmd_close(const char *arg) +{ + Z_APDU *apdu; + Z_Close *req; + if (only_z3950()) + return 0; + apdu = zget_APDU(out, Z_APDU_close); + req = apdu->u.close; + *req->closeReason = Z_Close_finished; + send_apdu(apdu); + printf("Sent close request.\n"); + sent_close = 1; + return 2; +} + +int cmd_packagename(const char* arg) +{ + xfree(esPackageName); + esPackageName = NULL; + if (*arg) + esPackageName = xstrdup(arg); + return 1; +} + +int cmd_proxy(const char* arg) +{ + xfree(yazProxy); + yazProxy = 0; + if (*arg) + yazProxy = xstrdup(arg); + return 1; +} + +int cmd_marccharset(const char *arg) +{ + char l1[30]; + + *l1 = 0; + if (sscanf(arg, "%29s", l1) < 1) + { + printf("MARC character set is `%s'\n", + marcCharset ? marcCharset: "none"); + return 1; + } + xfree(marcCharset); + marcCharset = 0; + if (strcmp(l1, "-") && strcmp(l1, "none")) + marcCharset = xstrdup(l1); + return 1; +} + +int cmd_querycharset(const char *arg) +{ + char l1[30]; + + *l1 = 0; + if (sscanf(arg, "%29s", l1) < 1) + { + printf("Query character set is `%s'\n", + queryCharset ? queryCharset: "none"); + return 1; + } + xfree(queryCharset); + queryCharset = 0; + if (strcmp(l1, "-") && strcmp(l1, "none")) + queryCharset = xstrdup(l1); + return 1; +} + +int cmd_displaycharset(const char *arg) +{ + char l1[30]; + + *l1 = 0; + if (sscanf(arg, "%29s", l1) < 1) + { + printf("Display character set is `%s'\n", + outputCharset ? outputCharset: "none"); + } + else + { + xfree(outputCharset); + outputCharset = 0; + if (!strcmp(l1, "auto") && codeset) + { + if (codeset) + { + printf("Display character set: %s\n", codeset); + outputCharset = xstrdup(codeset); + } + else + printf("No codeset found on this system\n"); + } + else if (strcmp(l1, "-") && strcmp(l1, "none")) + outputCharset = xstrdup(l1); + } + return 1; +} + +int cmd_negcharset(const char *arg) +{ + char l1[30]; + + *l1 = 0; + if (sscanf(arg, "%29s %d %d", l1, &negotiationCharsetRecords, + &negotiationCharsetVersion) < 1) + { + printf("Negotiation character set `%s'\n", + negotiationCharset ? negotiationCharset: "none"); + if (negotiationCharset) + { + printf("Records in charset %s\n", negotiationCharsetRecords ? + "yes" : "no"); + printf("Charneg version %d\n", negotiationCharsetVersion); + } + } + else + { + xfree(negotiationCharset); + negotiationCharset = NULL; + if (*l1 && strcmp(l1, "-") && strcmp(l1, "none")) + { + negotiationCharset = xstrdup(l1); + printf("Character set negotiation : %s\n", negotiationCharset); + } + } + return 1; +} + +int cmd_charset(const char* arg) +{ + char l1[30], l2[30], l3[30], l4[30]; + + *l1 = *l2 = *l3 = *l4 = '\0'; + if (sscanf(arg, "%29s %29s %29s %29s", l1, l2, l3, l4) < 1) + { + cmd_negcharset(""); + cmd_displaycharset(""); + cmd_marccharset(""); + cmd_querycharset(""); + } + else + { + cmd_negcharset(l1); + if (*l2) + cmd_displaycharset(l2); + if (*l3) + cmd_marccharset(l3); + if (*l4) + cmd_querycharset(l4); + } + return 1; +} + +int cmd_lang(const char* arg) +{ + if (*arg == '\0') { + printf("Current language is `%s'\n", yazLang ? yazLang : "none"); + return 1; + } + xfree(yazLang); + yazLang = NULL; + if (*arg) + yazLang = xstrdup(arg); + return 1; +} + +int cmd_source(const char* arg, int echo ) +{ + /* first should open the file and read one line at a time.. */ + FILE* includeFile; + char line[102400], *cp; + + if (strlen(arg) < 1) + { + fprintf(stderr, "Error in source command use a filename\n"); + return -1; + } + + includeFile = fopen(arg, "r"); + + if (!includeFile) + { + fprintf(stderr, "Unable to open file %s for reading\n",arg); + return -1; + } + + while (fgets(line, sizeof(line), includeFile)) + { + if (strlen(line) < 2) + continue; + if (line[0] == '#') + continue; + + if ((cp = strrchr(line, '\n'))) + *cp = '\0'; + + if (echo) + printf("processing line: %s\n", line); + process_cmd_line(line); + } + + if (fclose(includeFile)) + { + perror("unable to close include file"); + exit(1); + } + return 1; +} + +int cmd_source_echo(const char* arg) +{ + cmd_source(arg, 1); + return 1; +} + +int cmd_source_noecho(const char* arg) +{ + cmd_source(arg, 0); + return 1; +} + + +int cmd_subshell(const char* args) +{ + int ret = system(strlen(args) ? args : getenv("SHELL")); + printf("\n"); + if (ret) + { + printf("Exit %d\n", ret); + } + return 1; +} + +int cmd_set_berfile(const char *arg) +{ + if (ber_file && ber_file != stdout && ber_file != stderr) + fclose(ber_file); + if (!strcmp(arg, "")) + ber_file = 0; + else if (!strcmp(arg, "-")) + ber_file = stdout; + else + ber_file = fopen(arg, "a"); + return 1; +} + +int cmd_set_apdufile(const char *arg) +{ + if(apdu_file && apdu_file != stderr && apdu_file != stderr) + fclose(apdu_file); + if (!strcmp(arg, "")) + apdu_file = 0; + else if (!strcmp(arg, "-")) + apdu_file = stderr; + else + { + apdu_file = fopen(arg, "a"); + if (!apdu_file) + perror("unable to open apdu log file"); + } + if (apdu_file) + odr_setprint(print, apdu_file); + return 1; +} + +int cmd_set_cclfile(const char* arg) +{ + FILE *inf; + + bibset = ccl_qual_mk(); + inf = fopen(arg, "r"); + if (!inf) + perror("unable to open CCL file"); + else { - printf ("unknown record syntax\n"); + ccl_qual_file(bibset, inf); + fclose(inf); + } + strcpy(ccl_fields,arg); + return 0; +} + +int cmd_set_cqlfile(const char* arg) +{ + cql_transform_t newcqltrans; + + if ((newcqltrans = cql_transform_open_fname(arg)) == 0) { + perror("unable to open CQL file"); return 0; } - return 1; + if (cqltrans != 0) + cql_transform_close(cqltrans); + + cqltrans = newcqltrans; + strcpy(cql_fields, arg); + return 0; +} + +int cmd_set_auto_reconnect(const char* arg) +{ + if(strlen(arg)==0) { + auto_reconnect = ! auto_reconnect; + } else if(strcmp(arg,"on")==0) { + auto_reconnect = 1; + } else if(strcmp(arg,"off")==0) { + auto_reconnect = 0; + } else { + printf("Error use on or off\n"); + return 1; + } + + if (auto_reconnect) + printf("Set auto reconnect enabled.\n"); + else + printf("Set auto reconnect disabled.\n"); + + return 0; +} + + +int cmd_set_auto_wait(const char* arg) +{ + if(strlen(arg)==0) { + auto_wait = ! auto_wait; + } else if(strcmp(arg,"on")==0) { + auto_wait = 1; + } else if(strcmp(arg,"off")==0) { + auto_wait = 0; + } else { + printf("Error use on or off\n"); + return 1; + } + + if (auto_wait) + printf("Set auto wait enabled.\n"); + else + printf("Set auto wait disabled.\n"); + + return 0; +} + +int cmd_set_marcdump(const char* arg) +{ + if(marc_file && marc_file != stderr) { /* don't close stdout*/ + fclose(marc_file); + } + + if (!strcmp(arg, "")) + marc_file = 0; + else if (!strcmp(arg, "-")) + marc_file = stderr; + else + { + marc_file = fopen(arg, "a"); + if (!marc_file) + perror("unable to open marc log file"); + } + return 1; +} + +static void marc_file_write(const char *buf, size_t sz) +{ + if (marc_file) + { + if (fwrite(buf, 1, sz, marc_file) != sz) + { + perror("marcfile write"); + } + } +} +/* + this command takes 3 arge {name class oid} +*/ +int cmd_register_oid(const char* args) { + static struct { + char* className; + oid_class oclass; + } oid_classes[] = { + {"appctx",CLASS_APPCTX}, + {"absyn",CLASS_ABSYN}, + {"attset",CLASS_ATTSET}, + {"transyn",CLASS_TRANSYN}, + {"diagset",CLASS_DIAGSET}, + {"recsyn",CLASS_RECSYN}, + {"resform",CLASS_RESFORM}, + {"accform",CLASS_ACCFORM}, + {"extserv",CLASS_EXTSERV}, + {"userinfo",CLASS_USERINFO}, + {"elemspec",CLASS_ELEMSPEC}, + {"varset",CLASS_VARSET}, + {"schema",CLASS_SCHEMA}, + {"tagset",CLASS_TAGSET}, + {"general",CLASS_GENERAL}, + {0,(enum oid_class) 0} + }; + char oname_str[101], oclass_str[101], oid_str[101]; + int i; + oid_class oidclass = CLASS_GENERAL; + Odr_oid oid[OID_SIZE]; + + if (sscanf(args, "%100[^ ] %100[^ ] %100s", + oname_str,oclass_str, oid_str) < 1) { + printf("Error in register command \n"); + return 0; + } + + for (i = 0; oid_classes[i].className; i++) { + if (!strcmp(oid_classes[i].className, oclass_str)) + { + oidclass=oid_classes[i].oclass; + break; + } + } + + if(!(oid_classes[i].className)) { + printf("Unknown oid class %s\n",oclass_str); + return 0; + } + + oid_dotstring_to_oid(oid_str, oid); + + if (yaz_oid_add(yaz_oid_std(), oidclass, oname_str, oid)) + { + printf("oid %s already exists, registration failed\n", + oname_str); + } + return 1; +} + +int cmd_push_command(const char* arg) +{ +#if HAVE_READLINE_HISTORY_H + if(strlen(arg)>1) + add_history(arg); +#else + fprintf(stderr,"Not compiled with the readline/history module\n"); +#endif + return 1; +} + +void source_rc_file(const char *rc_file) +{ + /* If rc_file != NULL, source that. Else + Look for .yazclientrc and read it if it exists. + If it does not exist, read $HOME/.yazclientrc instead */ + struct stat statbuf; + + if (rc_file) + { + if (stat(rc_file, &statbuf) == 0) + cmd_source(rc_file, 0); + else + { + fprintf(stderr, "yaz_client: cannot source '%s'\n", rc_file); + exit(1); + } + } + else + { + char fname[1000]; + strcpy(fname, ".yazclientrc"); + if (stat(fname, &statbuf)==0) + { + cmd_source(fname, 0); + } + else + { + const char* homedir = getenv("HOME"); + if (homedir) + { + sprintf(fname, "%.800s/%s", homedir, ".yazclientrc"); + if (stat(fname, &statbuf)==0) + cmd_source(fname, 0); + } + } + } +} + +void add_to_readline_history(void *client_data, const char *line) +{ +#if HAVE_READLINE_HISTORY_H + if (strlen(line)) + add_history(line); +#endif +} + +static void initialize(const char *rc_file) +{ + FILE *inf; + int i; + + if (!(out = odr_createmem(ODR_ENCODE)) || + !(in = odr_createmem(ODR_DECODE)) || + !(print = odr_createmem(ODR_PRINT))) + { + fprintf(stderr, "failed to allocate ODR streams\n"); + exit(1); + } + + setvbuf(stdout, 0, _IONBF, 0); + if (apdu_file) + odr_setprint(print, apdu_file); + + bibset = ccl_qual_mk(); + inf = fopen(ccl_fields, "r"); + if (inf) + { + ccl_qual_file(bibset, inf); + fclose(inf); + } + + cqltrans = cql_transform_open_fname(cql_fields); + /* If this fails, no problem: we detect cqltrans == 0 later */ + +#if HAVE_READLINE_READLINE_H + rl_attempted_completion_function = + (char **(*)(const char *, int, int)) readline_completer; +#endif + for(i = 0; i < maxOtherInfosSupported; ++i) { + extraOtherInfos[i].oid[0] = -1; + extraOtherInfos[i].value = 0; + } + + cmd_format("usmarc"); + + file_history = file_history_new(); + + source_rc_file(rc_file); + + file_history_load(file_history); + file_history_trav(file_history, 0, add_to_readline_history); +} + + +#if HAVE_GETTIMEOFDAY +struct timeval tv_start; +#endif + +#if YAZ_HAVE_XML2 +static void handle_srw_record(Z_SRW_record *rec) +{ + if (rec->recordPosition) + { + printf("pos=" ODR_INT_PRINTF, *rec->recordPosition); + setno = *rec->recordPosition + 1; + } + if (rec->recordSchema) + printf(" schema=%s", rec->recordSchema); + printf("\n"); + if (rec->recordData_buf && rec->recordData_len) + { + printf("%.*s", rec->recordData_len, rec->recordData_buf); + marc_file_write(rec->recordData_buf, rec->recordData_len); + } + else + printf("No data!"); + printf("\n"); +} + +static void handle_srw_explain_response(Z_SRW_explainResponse *res) +{ + handle_srw_record(&res->record); +} + +static void handle_srw_response(Z_SRW_searchRetrieveResponse *res) +{ + int i; + + printf("Received SRW SearchRetrieve Response\n"); + + for (i = 0; inum_diagnostics; i++) + { + if (res->diagnostics[i].uri) + printf("SRW diagnostic %s\n", + res->diagnostics[i].uri); + else + printf("SRW diagnostic missing or could not be decoded\n"); + if (res->diagnostics[i].message) + printf("Message: %s\n", res->diagnostics[i].message); + if (res->diagnostics[i].details) + printf("Details: %s\n", res->diagnostics[i].details); + } + if (res->numberOfRecords) + printf("Number of hits: " ODR_INT_PRINTF "\n", *res->numberOfRecords); + for (i = 0; inum_records; i++) + handle_srw_record(res->records + i); +} + +static void handle_srw_scan_term(Z_SRW_scanTerm *term) +{ + if (term->displayTerm) + printf("%s:", term->displayTerm); + else if (term->value) + printf("%s:", term->value); + else + printf("No value:"); + if (term->numberOfRecords) + printf(" " ODR_INT_PRINTF, *term->numberOfRecords); + if (term->whereInList) + printf(" %s", term->whereInList); + if (term->value && term->displayTerm) + printf(" %s", term->value); + + strcpy(last_scan_line, term->value); + printf("\n"); +} + +static void handle_srw_scan_response(Z_SRW_scanResponse *res) +{ + int i; + + printf("Received SRW Scan Response\n"); + + for (i = 0; inum_diagnostics; i++) + { + if (res->diagnostics[i].uri) + printf("SRW diagnostic %s\n", + res->diagnostics[i].uri); + else + printf("SRW diagnostic missing or could not be decoded\n"); + if (res->diagnostics[i].message) + printf("Message: %s\n", res->diagnostics[i].message); + if (res->diagnostics[i].details) + printf("Details: %s\n", res->diagnostics[i].details); + } + if (res->terms) + for (i = 0; inum_terms; i++) + handle_srw_scan_term(res->terms + i); +} + +static void http_response(Z_HTTP_Response *hres) +{ + int ret = -1; + const char *connection_head = z_HTTP_header_lookup(hres->headers, + "Connection"); + if (!yaz_srw_check_content_type(hres)) + printf("Content type does not appear to be XML\n"); + else + { + Z_SOAP *soap_package = 0; + ODR o = odr_createmem(ODR_DECODE); + Z_SOAP_Handler soap_handlers[3] = { + {YAZ_XMLNS_SRU_v1_1, 0, (Z_SOAP_fun) yaz_srw_codec}, + {YAZ_XMLNS_UPDATE_v0_9, 0, (Z_SOAP_fun) yaz_ucp_codec}, + {0, 0, 0} + }; + ret = z_soap_codec(o, &soap_package, + &hres->content_buf, &hres->content_len, + soap_handlers); + if (!ret && soap_package->which == Z_SOAP_generic) + { + Z_SRW_PDU *sr = (Z_SRW_PDU *) soap_package->u.generic->p; + if (sr->which == Z_SRW_searchRetrieve_response) + handle_srw_response(sr->u.response); + else if (sr->which == Z_SRW_explain_response) + handle_srw_explain_response(sr->u.explain_response); + else if (sr->which == Z_SRW_scan_response) + handle_srw_scan_response(sr->u.scan_response); + else if (sr->which == Z_SRW_update_response) + printf("Got update response. Status: %s\n", + sr->u.update_response->operationStatus); + else + ret = -1; + } + else if (soap_package && (soap_package->which == Z_SOAP_fault + || soap_package->which == Z_SOAP_error)) + { + printf("HTTP Error Status=%d\n", hres->code); + printf("SOAP Fault code %s\n", + soap_package->u.fault->fault_code); + printf("SOAP Fault string %s\n", + soap_package->u.fault->fault_string); + if (soap_package->u.fault->details) + printf("SOAP Details %s\n", + soap_package->u.fault->details); + } + else + { + printf("z_soap_codec failed. (no SOAP error)\n"); + ret = -1; + } + odr_destroy(o); + } + if (ret) + { + if (hres->code != 200) + { + printf("HTTP Error Status=%d\n", hres->code); + } + else + { + printf("Decoding of SRW package failed\n"); + } + close_session(); + } + else + { + if (!strcmp(hres->version, "1.0")) + { + /* HTTP 1.0: only if Keep-Alive we stay alive.. */ + if (!connection_head || strcmp(connection_head, "Keep-Alive")) + close_session(); + } + else + { + /* HTTP 1.1: only if no close we stay alive .. */ + if (connection_head && !strcmp(connection_head, "close")) + close_session(); + } + } +} +#endif + +static void wait_and_handle_response(int one_response_only) +{ + int reconnect_ok = 1; + int res; + char *netbuffer= 0; + int netbufferlen = 0; +#if HAVE_GETTIMEOFDAY + int got_tv_end = 0; + struct timeval tv_end; +#endif + Z_GDU *gdu; + + while(conn) + { + res = cs_get(conn, &netbuffer, &netbufferlen); + if (reconnect_ok && res <= 0 && protocol == PROTO_HTTP) + { + cs_close(conn); + conn = 0; + session_connect(cur_host); + reconnect_ok = 0; + if (conn) + { + char *buf_out; + int len_out; + + buf_out = odr_getbuf(out, &len_out, 0); + + do_hex_dump(buf_out, len_out); + + cs_put(conn, buf_out, len_out); + + odr_reset(out); + continue; + } + } + else if (res <= 0) + { + printf("Target closed connection\n"); + close_session(); + break; + } +#if HAVE_GETTIMEOFDAY + if (got_tv_end == 0) + gettimeofday(&tv_end, 0); /* count first one only */ + got_tv_end++; +#endif + odr_reset(out); + odr_reset(in); /* release APDU from last round */ + record_last = 0; + do_hex_dump(netbuffer, res); + odr_setbuf(in, netbuffer, res, 0); + + if (!z_GDU(in, &gdu, 0, 0)) + { + FILE *f = ber_file ? ber_file : stdout; + odr_perror(in, "Decoding incoming APDU"); + fprintf(f, "[Near %ld]\n", (long) odr_offset(in)); + fprintf(f, "Packet dump:\n---------\n"); + odr_dumpBER(f, netbuffer, res); + fprintf(f, "---------\n"); + if (apdu_file) + { + z_GDU(print, &gdu, 0, 0); + odr_reset(print); + } + if (conn && cs_more(conn)) + continue; + break; + } + if (ber_file) + odr_dumpBER(ber_file, netbuffer, res); + if (apdu_file && !z_GDU(print, &gdu, 0, 0)) + { + odr_perror(print, "Failed to print incoming APDU"); + odr_reset(print); + continue; + } + if (gdu->which == Z_GDU_Z3950) + { + Z_APDU *apdu = gdu->u.z3950; + switch(apdu->which) + { + case Z_APDU_initResponse: + process_initResponse(apdu->u.initResponse); + break; + case Z_APDU_searchResponse: + process_searchResponse(apdu->u.searchResponse); + break; + case Z_APDU_scanResponse: + process_scanResponse(apdu->u.scanResponse); + break; + case Z_APDU_presentResponse: + print_refid(apdu->u.presentResponse->referenceId); + setno += + *apdu->u.presentResponse->numberOfRecordsReturned; + if (apdu->u.presentResponse->records) + display_records(apdu->u.presentResponse->records); + else + printf("No records.\n"); + printf("nextResultSetPosition = " ODR_INT_PRINTF "\n", + *apdu->u.presentResponse->nextResultSetPosition); + break; + case Z_APDU_sortResponse: + process_sortResponse(apdu->u.sortResponse); + break; + case Z_APDU_extendedServicesResponse: + printf("Got extended services response\n"); + process_ESResponse(apdu->u.extendedServicesResponse); + break; + case Z_APDU_close: + printf("Target has closed the association.\n"); + process_close(apdu->u.close); + break; + case Z_APDU_resourceControlRequest: + process_resourceControlRequest + (apdu->u.resourceControlRequest); + break; + case Z_APDU_deleteResultSetResponse: + process_deleteResultSetResponse(apdu->u. + deleteResultSetResponse); + break; + default: + printf("Received unknown APDU type (%d).\n", + apdu->which); + close_session(); + } + } +#if YAZ_HAVE_XML2 + else if (gdu->which == Z_GDU_HTTP_Response) + { + http_response(gdu->u.HTTP_Response); + } +#endif + if (one_response_only) + break; + if (conn && !cs_more(conn)) + break; + } +#if HAVE_GETTIMEOFDAY + if (got_tv_end) + { +#if 0 + printf("S/U S/U=%ld/%ld %ld/%ld", + (long) tv_start.tv_sec, + (long) tv_start.tv_usec, + (long) tv_end.tv_sec, + (long) tv_end.tv_usec); +#endif + printf("Elapsed: %.6f\n", + (double) tv_end.tv_usec / 1e6 + tv_end.tv_sec - + ((double) tv_start.tv_usec / 1e6 + tv_start.tv_sec)); + } +#endif + xfree(netbuffer); +} + + +int cmd_cclparse(const char* arg) +{ + int error, pos; + struct ccl_rpn_node *rpn=NULL; + + + rpn = ccl_find_str(bibset, arg, &error, &pos); + + if (error) { + int ioff = 3+strlen(last_cmd)+1+pos; + printf("%*s^ - ", ioff, " "); + printf("%s\n", ccl_err_msg(error)); + } + else + { + if (rpn) + { + ccl_pr_tree(rpn, stdout); + } + } + if (rpn) + ccl_rpn_delete(rpn); + + printf("\n"); + + return 0; +} + + +int cmd_set_otherinfo(const char* args) +{ + char oidstr[101], otherinfoString[101]; + int otherinfoNo; + int sscan_res; + + sscan_res = sscanf(args, "%d %100[^ ] %100s", + &otherinfoNo, oidstr, otherinfoString); + + if (sscan_res > 0 && otherinfoNo >= maxOtherInfosSupported) { + printf("Error otherinfo index too large (%d>=%d)\n", + otherinfoNo,maxOtherInfosSupported); + return 0; + } + + + if (sscan_res==1) + { + /* reset this otherinfo */ + extraOtherInfos[otherinfoNo].oid[0] = -1; + xfree(extraOtherInfos[otherinfoNo].value); + extraOtherInfos[otherinfoNo].value = 0; + return 0; + } + if (sscan_res != 3) { + printf("Error in set_otherinfo command \n"); + return 0; + } + else + { + NMEM oid_tmp = nmem_create(); + const Odr_oid *oid = + yaz_string_to_oid_nmem(yaz_oid_std(), + CLASS_GENERAL, oidstr, oid_tmp); + oid_oidcpy(extraOtherInfos[otherinfoNo].oid, oid); + + xfree(extraOtherInfos[otherinfoNo].value); + extraOtherInfos[otherinfoNo].value = xstrdup(otherinfoString); + + nmem_destroy(oid_tmp); + } + + return 0; +} + +int cmd_sleep(const char* args ) +{ + int sec=atoi(args); + if( sec > 0 ) { +#ifdef WIN32 + Sleep(sec*1000); +#else + sleep(sec); +#endif + printf("Done sleeping %d seconds\n", sec); + } + return 1; +} + +int cmd_list_otherinfo(const char* args) +{ + int i; + + if (strlen(args)>0) + { + i = atoi(args); + if (i >= maxOtherInfosSupported) + { + printf("Error otherinfo index to large (%d>%d)\n",i,maxOtherInfosSupported); + return 0; + } + if (extraOtherInfos[i].value) + { + char name_oid[OID_STR_MAX]; + oid_class oclass; + const char *name = + yaz_oid_to_string_buf(extraOtherInfos[i].oid, &oclass, + name_oid); + printf(" otherinfo %d %s %s\n", + i, name ? name : "null", + extraOtherInfos[i].value); + } + + } + else + { + for(i = 0; i < maxOtherInfosSupported; ++i) + { + if (extraOtherInfos[i].value) + { + char name_oid[OID_STR_MAX]; + oid_class oclass; + const char *name = + yaz_oid_to_string_buf(extraOtherInfos[i].oid, &oclass, + name_oid); + printf(" otherinfo %d %s %s\n", + i, name ? name : "null", + extraOtherInfos[i].value); + } + } + } + return 0; +} + + +int cmd_list_all(const char* args) { + int i; + + /* connection options */ + if (conn) + printf("Connected to : %s\n", cur_host); + else if (*cur_host) + printf("Not connected to : %s\n", cur_host); + else + printf("Not connected : \n"); + if (yazProxy) printf("using proxy : %s\n",yazProxy); + + printf("auto_reconnect : %s\n",auto_reconnect?"on":"off"); + printf("auto_wait : %s\n",auto_wait?"on":"off"); + + if (!auth) { + printf("Authentication : none\n"); + } else { + switch(auth->which) { + case Z_IdAuthentication_idPass: + printf("Authentication : IdPass\n"); + printf(" Login User : %s\n",auth->u.idPass->userId?auth->u.idPass->userId:""); + printf(" Login Group : %s\n",auth->u.idPass->groupId?auth->u.idPass->groupId:""); + printf(" Password : %s\n",auth->u.idPass->password?auth->u.idPass->password:""); + break; + case Z_IdAuthentication_open: + printf("Authentication : psOpen\n"); + printf(" Open string : %s\n",auth->u.open); + break; + default: + printf("Authentication : Unknown\n"); + } + } + if (negotiationCharset) + printf("Neg. Character set : `%s'\n", negotiationCharset); + + /* bases */ + printf("Bases : "); + for (i = 0; i 0) + { + printf("Format : %s\n", recordsyntax_list[0]); + } + printf("Schema : %s\n",record_schema ? record_schema : "not set"); + printf("Elements : %s\n",elementSetNames?elementSetNames->u.generic:""); + + /* loging options */ + printf("APDU log : %s\n",apdu_file?"on":"off"); + printf("Record log : %s\n",marc_file?"on":"off"); + + /* other infos */ + printf("Other Info: \n"); + cmd_list_otherinfo(""); + + return 0; +} + +int cmd_clear_otherinfo(const char* args) +{ + if(strlen(args)>0) { + int otherinfoNo = atoi(args); + if (otherinfoNo >= maxOtherInfosSupported) { + printf("Error otherinfo index too large (%d>=%d)\n", + otherinfoNo, maxOtherInfosSupported); + return 0; + } + if (extraOtherInfos[otherinfoNo].value) + { + /* only clear if set. */ + extraOtherInfos[otherinfoNo].oid[0] = -1; + xfree(extraOtherInfos[otherinfoNo].value); + extraOtherInfos[otherinfoNo].value = 0; + } + } else { + int i; + for(i = 0; i < maxOtherInfosSupported; ++i) + { + if (extraOtherInfos[i].value) + { + extraOtherInfos[i].oid[0] = -1; + xfree(extraOtherInfos[i].value); + extraOtherInfos[i].value = 0; + } + } + } + return 0; } -int cmd_elements(char *arg) +int cmd_wait_response(const char *arg) { - static Z_ElementSetNames esn; - static char what[100]; + int wait_for = atoi(arg); + int i=0; + if( wait_for < 1 ) { + wait_for = 1; + }; - if (!arg || !*arg) - { - elementSetNames = 0; - return 1; - } - strcpy(what, arg); - esn.which = Z_ElementSetNames_generic; - esn.u.generic = what; - elementSetNames = &esn; - return 1; + for( i=0 ; i < wait_for ; ++i ) { + wait_and_handle_response(1); + }; + return 0; } -int cmd_attributeset(char *arg) +static int cmd_help(const char *line); + +typedef char *(*completerFunctionType)(const char *text, int state); + +static struct { + char *cmd; + int (*fun)(const char *arg); + char *ad; + completerFunctionType rl_completerfunction; + int complete_filenames; + const char **local_tabcompletes; +} cmd_array[] = { + {"open", cmd_open, "('tcp'|'ssl')':[':'][/]",NULL,0,NULL}, + {"quit", cmd_quit, "",NULL,0,NULL}, + {"find", cmd_find, "",NULL,0,NULL}, + {"delete", cmd_delete, "",NULL,0,NULL}, + {"base", cmd_base, "",NULL,0,NULL}, + {"show", cmd_show, "['+'<#recs>['+']]",NULL,0,NULL}, + {"setscan", cmd_setscan, "",NULL,0,NULL}, + {"scan", cmd_scan, "",NULL,0,NULL}, + {"scanstep", cmd_scanstep, "",NULL,0,NULL}, + {"scanpos", cmd_scanpos, "",NULL,0,NULL}, + {"scansize", cmd_scansize, "",NULL,0,NULL}, + {"sort", cmd_sort, " ...",NULL,0,NULL}, + {"sort+", cmd_sort_newset, " ...",NULL,0,NULL}, + {"authentication", cmd_authentication, "",NULL,0,NULL}, + {"lslb", cmd_lslb, "",NULL,0,NULL}, + {"ssub", cmd_ssub, "",NULL,0,NULL}, + {"mspn", cmd_mspn, "",NULL,0,NULL}, + {"status", cmd_status, "",NULL,0,NULL}, + {"setnames", cmd_setnames, "",NULL,0,NULL}, + {"cancel", cmd_cancel, "",NULL,0,NULL}, + {"cancel_find", cmd_cancel_find, "",NULL,0,NULL}, + {"format", cmd_format, "",complete_format,0,NULL}, + {"schema", cmd_schema, "",complete_schema,0,NULL}, + {"elements", cmd_elements, "",NULL,0,NULL}, + {"close", cmd_close, "",NULL,0,NULL}, + {"querytype", cmd_querytype, "",complete_querytype,0,NULL}, + {"refid", cmd_refid, "",NULL,0,NULL}, + {"itemorder", cmd_itemorder, "ill|item|xml ",NULL,0,NULL}, + {"update", cmd_update, " []",NULL,0,NULL}, + {"update0", cmd_update0, " []",NULL,0,NULL}, + {"xmles", cmd_xmles, " ",NULL,0,NULL}, + {"packagename", cmd_packagename, "",NULL,0,NULL}, + {"proxy", cmd_proxy, "[('tcp'|'ssl')][':']",NULL,0,NULL}, + {"charset", cmd_charset, " ",NULL,0,NULL}, + {"negcharset", cmd_negcharset, "",NULL,0,NULL}, + {"displaycharset", cmd_displaycharset, "",NULL,0,NULL}, + {"marccharset", cmd_marccharset, "",NULL,0,NULL}, + {"querycharset", cmd_querycharset, "",NULL,0,NULL}, + {"lang", cmd_lang, "",NULL,0,NULL}, + {"source", cmd_source_echo, "",NULL,1,NULL}, + {".", cmd_source_echo, "",NULL,1,NULL}, + {"!", cmd_subshell, "Subshell command",NULL,1,NULL}, + {"set_apdufile", cmd_set_apdufile, "",NULL,1,NULL}, + {"set_berfile", cmd_set_berfile, "",NULL,1,NULL}, + {"set_marcdump", cmd_set_marcdump," ",NULL,1,NULL}, + {"set_cclfile", cmd_set_cclfile," ",NULL,1,NULL}, + {"set_cqlfile", cmd_set_cqlfile," ",NULL,1,NULL}, + {"set_auto_reconnect", cmd_set_auto_reconnect," on|off",complete_auto_reconnect,1,NULL}, + {"set_auto_wait", cmd_set_auto_wait," on|off",complete_auto_reconnect,1,NULL}, + {"set_otherinfo", cmd_set_otherinfo," ",NULL,0,NULL}, + {"sleep", cmd_sleep,"",NULL,0,NULL}, + {"register_oid", cmd_register_oid," ",NULL,0,NULL}, + {"push_command", cmd_push_command,"",command_generator,0,NULL}, + {"register_tab", cmd_register_tab," ",command_generator,0,NULL}, + {"cclparse", cmd_cclparse,"",NULL,0,NULL}, + {"list_otherinfo",cmd_list_otherinfo,"[otherinfoinddex]",NULL,0,NULL}, + {"list_all",cmd_list_all,"",NULL,0,NULL}, + {"clear_otherinfo",cmd_clear_otherinfo,"",NULL,0,NULL}, + {"wait_response",cmd_wait_response,"",NULL,0,NULL}, + /* Server Admin Functions */ + {"adm-reindex", cmd_adm_reindex, "",NULL,0,NULL}, + {"adm-truncate", cmd_adm_truncate, "('database'|'index')",NULL,0,NULL}, + {"adm-create", cmd_adm_create, "",NULL,0,NULL}, + {"adm-drop", cmd_adm_drop, "('database'|'index')",NULL,0,NULL}, + {"adm-import", cmd_adm_import, " ",NULL,0,NULL}, + {"adm-refresh", cmd_adm_refresh, "",NULL,0,NULL}, + {"adm-commit", cmd_adm_commit, "",NULL,0,NULL}, + {"adm-shutdown", cmd_adm_shutdown, "",NULL,0,NULL}, + {"adm-startup", cmd_adm_startup, "",NULL,0,NULL}, + {"explain", cmd_explain, "", NULL, 0, NULL}, + {"options", cmd_options, "", NULL, 0, NULL}, + {"zversion", cmd_zversion, "", NULL, 0, NULL}, + {"help", cmd_help, "", NULL,0,NULL}, + {"init", cmd_init, "", NULL,0,NULL}, + {"sru", cmd_sru, " ", NULL,0,NULL}, + {"exit", cmd_quit, "",NULL,0,NULL}, + {0,0,0,0,0,0} +}; + +static int cmd_help(const char *line) { - char what[100]; + int i; + char topic[21]; - if (!arg || !*arg) + *topic = 0; + sscanf(line, "%20s", topic); + + if (*topic == 0) + printf("Commands:\n"); + for (i = 0; cmd_array[i].cmd; i++) + if (*topic == 0 || strcmp(topic, cmd_array[i].cmd) == 0) + printf(" %s %s\n", cmd_array[i].cmd, cmd_array[i].ad); + if (!strcmp(topic, "find")) { - printf("Usage: attributeset \n"); - return 0; + printf("RPN:\n"); + printf(" \"term\" Simple Term\n"); + printf(" @attr [attset] type=value op Attribute\n"); + printf(" @and opl opr And\n"); + printf(" @or opl opr Or\n"); + printf(" @not opl opr And-Not\n"); + printf(" @set set Result set\n"); + printf(" @prox exl dist ord rel uc ut Proximity. Use help prox\n"); + printf("\n"); + printf("Bib-1 attribute types\n"); + printf("1=Use: "); + printf("4=Title 7=ISBN 8=ISSN 30=Date 62=Abstract 1003=Author 1016=Any\n"); + printf("2=Relation: "); + printf("1< 2<= 3= 4>= 5> 6!= 102=Relevance\n"); + printf("3=Position: "); + printf("1=First in Field 2=First in subfield 3=Any position\n"); + printf("4=Structure: "); + printf("1=Phrase 2=Word 3=Key 4=Year 5=Date 6=WordList\n"); + printf("5=Truncation: "); + printf("1=Right 2=Left 3=L&R 100=No 101=# 102=Re-1 103=Re-2\n"); + printf("6=Completeness:"); + printf("1=Incomplete subfield 2=Complete subfield 3=Complete field\n"); } - sscanf(arg, "%s", what); - if (p_query_attset (what)) + if (!strcmp(topic, "prox")) { - printf("Unknown attribute set name\n"); - return 0; + printf("Proximity:\n"); + printf(" @prox exl dist ord rel uc ut\n"); + printf(" exl: exclude flag . 0=include, 1=exclude.\n"); + printf(" dist: distance integer.\n"); + printf(" ord: order flag. 0=unordered, 1=ordered.\n"); + printf(" rel: relation integer. 1< 2<= 3= 4>= 5> 6!= .\n"); + printf(" uc: unit class. k=known, p=private.\n"); + printf(" ut: unit type. 1=character, 2=word, 3=sentence,\n"); + printf(" 4=paragraph, 5=section, 6=chapter, 7=document,\n"); + printf(" 8=element, 9=subelement, 10=elementType, 11=byte.\n"); + printf("\nExamples:\n"); + printf(" Search for a and b in-order at most 3 words apart:\n"); + printf(" @prox 0 3 1 2 k 2 a b\n"); + printf(" Search for any order of a and b next to each other:\n"); + printf(" @prox 0 1 0 3 k 2 a b\n"); } return 1; } -int cmd_querytype (char *arg) +int cmd_register_tab(const char* arg) { - if (!strcmp (arg, "ccl")) - queryType = QueryType_CCL; - else if (!strcmp (arg, "prefix") || !strcmp(arg, "rpn")) - queryType = QueryType_Prefix; -#if CCL2RPN - else if (!strcmp (arg, "ccl2rpn") || !strcmp (arg, "cclrpn")) - queryType = QueryType_CCL2RPN; -#endif - else - { - printf ("Querytype must be one of:\n"); - printf (" prefix - Prefix query\n"); - printf (" ccl - CCL query\n"); -#if CCL2RPN - printf (" ccl2rpn - CCL query converted to RPN\n"); -#endif +#if HAVE_READLINE_READLINE_H + char command[101], tabargument[101]; + int i; + int num_of_tabs; + const char** tabslist; + + if (sscanf(arg, "%100s %100s", command, tabargument) < 1) { return 0; } + + /* locate the amdn in the list */ + for (i = 0; cmd_array[i].cmd; i++) { + if (!strncmp(cmd_array[i].cmd, command, strlen(command))) { + break; + } + } + + if (!cmd_array[i].cmd) { + fprintf(stderr,"Unknown command %s\n",command); + return 1; + } + + + if (!cmd_array[i].local_tabcompletes) + cmd_array[i].local_tabcompletes = (const char **) calloc(1,sizeof(char**)); + + num_of_tabs=0; + + tabslist = cmd_array[i].local_tabcompletes; + for(; tabslist && *tabslist; tabslist++) { + num_of_tabs++; + } + + cmd_array[i].local_tabcompletes = (const char **) + realloc(cmd_array[i].local_tabcompletes, + (num_of_tabs+2)*sizeof(char**)); + tabslist = cmd_array[i].local_tabcompletes; + tabslist[num_of_tabs] = strdup(tabargument); + tabslist[num_of_tabs+1] = NULL; +#endif return 1; } -int cmd_refid (char *arg) + +void process_cmd_line(char* line) { - xfree (refid); - refid = NULL; - if (*arg) + int i, res; + char word[32], arg[10240]; + +#if HAVE_GETTIMEOFDAY + gettimeofday(&tv_start, 0); +#endif + + if ((res = sscanf(line, "%31s %10239[^;]", word, arg)) <= 0) { - refid = (char *) xmalloc (strlen(arg)+1); - strcpy (refid, arg); + strcpy(word, last_cmd); + *arg = '\0'; } - return 1; + else if (res == 1) + *arg = 0; + strcpy(last_cmd, word); + + /* removed tailing spaces from the arg command */ + { + char* p = arg; + char* lastnonspace=NULL; + + for(;*p; ++p) { + if(!isspace(*(unsigned char *) p)) { + lastnonspace = p; + } + } + if(lastnonspace) + *(++lastnonspace) = 0; + } + + for (i = 0; cmd_array[i].cmd; i++) + if (!strncmp(cmd_array[i].cmd, word, strlen(word))) + { + res = (*cmd_array[i].fun)(arg); + break; + } + + if (!cmd_array[i].cmd) /* dump our help-screen */ + { + printf("Unknown command: %s.\n", word); + printf("Type 'help' for list of commands\n"); + res = 1; + } + + if(apdu_file) fflush(apdu_file); + + if (res >= 2 && auto_wait) + wait_and_handle_response(0); + + if(apdu_file) + fflush(apdu_file); + if(marc_file) + fflush(marc_file); } -int cmd_close(char *arg) +static char *command_generator(const char *text, int state) { - Z_APDU *apdu; - Z_Close *req; - if (!conn) - return 0; +#if HAVE_READLINE_READLINE_H + static int idx; + if (state==0) { + idx = 0; + } + for( ; cmd_array[idx].cmd; ++idx) { + if (!strncmp(cmd_array[idx].cmd, text, strlen(text))) { + ++idx; /* skip this entry on the next run */ + return strdup(cmd_array[idx-1].cmd); + } + } +#endif + return NULL; +} - apdu = zget_APDU(out, Z_APDU_close); - req = apdu->u.close; - *req->closeReason = Z_Close_finished; - send_apdu(apdu); - printf("Sent close request.\n"); - sent_close = 1; - return 2; +#if HAVE_READLINE_READLINE_H +static const char** default_completer_list = NULL; + +static char* default_completer(const char* text, int state) +{ + return complete_from_list(default_completer_list, text, state); } +#endif -int cmd_packagename(char* arg) { - xfree (esPackageName); - esPackageName = NULL; - if (*arg) - { - esPackageName = (char *) xmalloc (strlen(arg)+1); - strcpy (esPackageName, arg); - } - return 1; -}; +#if HAVE_READLINE_READLINE_H -static void initialize(void) +/* + This function only known how to complete on the first word +*/ +char **readline_completer(char *text, int start, int end) { -#if CCL2RPN - FILE *inf; + completerFunctionType completerToUse; + + if(start == 0) { +#if HAVE_READLINE_RL_COMPLETION_MATCHES + char** res = rl_completion_matches(text, command_generator); +#else + char** res = completion_matches(text, + (CPFunction*)command_generator); #endif - nmem_init(); - if (!(out = odr_createmem(ODR_ENCODE)) || - !(in = odr_createmem(ODR_DECODE)) || - !(print = odr_createmem(ODR_PRINT))) - { - fprintf(stderr, "failed to allocate ODR streams\n"); - exit(1); - } - setvbuf(stdout, 0, _IONBF, 0); - if (apdu_file) - odr_setprint(print, apdu_file); + rl_attempted_completion_over = 1; + return res; + } else { + char arg[10240],word[32]; + int i=0 ,res; + if ((res = sscanf(rl_line_buffer, "%31s %10239[^;]", word, arg)) <= 0) { + rl_attempted_completion_over = 1; + return NULL; + } -#if CCL2RPN - bibset = ccl_qual_mk (); - inf = fopen (ccl_fields, "r"); - if (inf) - { - ccl_qual_file (bibset, inf); - fclose (inf); + for (i = 0; cmd_array[i].cmd; i++) + if (!strncmp(cmd_array[i].cmd, word, strlen(word))) + break; + + if(!cmd_array[i].cmd) + return NULL; + + default_completer_list = cmd_array[i].local_tabcompletes; + + completerToUse = cmd_array[i].rl_completerfunction; + if (!completerToUse) + { /* if command completer is not defined use the default completer */ + completerToUse = default_completer; + } + if (completerToUse) { +#ifdef HAVE_READLINE_RL_COMPLETION_MATCHES + char** res= + rl_completion_matches(text, completerToUse); +#else + char** res= + completion_matches(text, (CPFunction*)completerToUse); +#endif + if (!cmd_array[i].complete_filenames) + rl_attempted_completion_over = 1; + return res; + } else { + if (!cmd_array[i].complete_filenames) + rl_attempted_completion_over = 1; + return 0; + } } +} #endif - cmd_base("Default"); + +#ifndef WIN32 +void ctrl_c_handler(int x) +{ + exit_client(0); } +#endif -static int client(int wait) +static void client(void) { - static struct { - char *cmd; - int (*fun)(char *arg); - char *ad; - } cmd[] = { - {"open", cmd_open, "('tcp'|'osi')':'['/'][':']"}, - {"quit", cmd_quit, ""}, - {"find", cmd_find, ""}, - {"delete", cmd_delete, ""}, - {"base", cmd_base, ""}, - {"show", cmd_show, "['+'<#recs>['+']]"}, - {"scan", cmd_scan, ""}, - {"sort", cmd_sort, " ..."}, - {"sort+", cmd_sort_newset, " ..."}, - {"authentication", cmd_authentication, ""}, - {"lslb", cmd_lslb, ""}, - {"ssub", cmd_ssub, ""}, - {"mspn", cmd_mspn, ""}, - {"status", cmd_status, ""}, - {"setnames", cmd_setnames, ""}, - {"cancel", cmd_cancel, ""}, - {"format", cmd_format, ""}, - {"schema", cmd_schema, ""}, - {"elements", cmd_elements, ""}, - {"close", cmd_close, ""}, - {"attributeset", cmd_attributeset, ""}, - {"querytype", cmd_querytype, ""}, - {"refid", cmd_refid, ""}, - {"itemorder", cmd_itemorder, "ill|item "}, - {"update", cmd_update, ""}, - {"packagename", cmd_packagename, ""}, -#ifdef ASN_COMPILED - /* Server Admin Functions */ - {"adm-reindex", cmd_adm_reindex, ""}, - {"adm-truncate", cmd_adm_truncate, "('database'|'index')"}, - {"adm-create", cmd_adm_create, ""}, - {"adm-drop", cmd_adm_drop, "('database'|'index')"}, - {"adm-import", cmd_adm_import, " "}, - {"adm-refresh", cmd_adm_refresh, ""}, - {"adm-commit", cmd_adm_commit, ""}, - {"adm-shutdown", cmd_adm_shutdown, ""}, - {"adm-startup", cmd_adm_startup, ""}, + char line[10240]; + + line[10239] = '\0'; + +#ifndef WIN32 + signal(SIGINT, ctrl_c_handler); #endif - {0,0} - }; - char *netbuffer= 0; - int netbufferlen = 0; - int i; - Z_APDU *apdu; + #if HAVE_GETTIMEOFDAY - struct timeval tv_start, tv_end; - gettimeofday (&tv_start, 0); + gettimeofday(&tv_start, 0); #endif while (1) { - int res; -#ifdef USE_SELECT - fd_set input; -#endif - char line[1024], word[1024], arg[1024]; - -#ifdef USE_SELECT - FD_ZERO(&input); - FD_SET(0, &input); - if (conn) - FD_SET(cs_fileno(conn), &input); - if ((res = select(20, &input, 0, 0, 0)) < 0) - { - perror("select"); - exit(1); - } - if (!res) - continue; - if (!wait && FD_ISSET(0, &input)) -#else - if (!wait) -#endif - { + char *line_in = NULL; #if HAVE_READLINE_READLINE_H - char* line_in; + if (isatty(0)) + { line_in=readline(C_PROMPT); if (!line_in) break; @@ -2470,196 +4867,200 @@ static int client(int wait) if (*line_in) add_history(line_in); #endif - strcpy(line,line_in); - free (line_in); -#else + strncpy(line, line_in, sizeof(line)-1); + free(line_in); + } +#endif + if (!line_in) + { char *end_p; - printf (C_PROMPT); + printf(C_PROMPT); fflush(stdout); - if (!fgets(line, 1023, stdin)) + if (!fgets(line, sizeof(line)-1, stdin)) break; - if ((end_p = strchr (line, '\n'))) + if ((end_p = strchr(line, '\n'))) *end_p = '\0'; -#endif -#if HAVE_GETTIMEOFDAY - gettimeofday (&tv_start, 0); -#endif - - if ((res = sscanf(line, "%s %[^;]", word, arg)) <= 0) - { - strcpy(word, last_cmd); - *arg = '\0'; - } - else if (res == 1) - *arg = 0; - strcpy(last_cmd, word); - for (i = 0; cmd[i].cmd; i++) - if (!strncmp(cmd[i].cmd, word, strlen(word))) - { - res = (*cmd[i].fun)(arg); - break; - } - if (!cmd[i].cmd) /* dump our help-screen */ - { - printf("Unknown command: %s.\n", word); - printf("Currently recognized commands:\n"); - for (i = 0; cmd[i].cmd; i++) - printf(" %s %s\n", cmd[i].cmd, cmd[i].ad); - res = 1; - } - if (res < 2) - { - continue; - } - } - wait = 0; - if (conn -#ifdef USE_SELECT - && FD_ISSET(cs_fileno(conn), &input) -#endif - ) - { - do - { - if ((res = cs_get(conn, &netbuffer, &netbufferlen)) < 0) - { - perror("cs_get"); - exit(1); - } - if (!res) - { - printf("Target closed connection.\n"); - exit(1); - } - odr_reset(in); /* release APDU from last round */ - record_last = 0; - odr_setbuf(in, netbuffer, res, 0); - if (!z_APDU(in, &apdu, 0, 0)) - { - odr_perror(in, "Decoding incoming APDU"); - fprintf(stderr, "[Near %d]\n", odr_offset(in)); - fprintf(stderr, "Packet dump:\n---------\n"); - odr_dumpBER(stderr, netbuffer, res); - fprintf(stderr, "---------\n"); - if (apdu_file) - z_APDU(print, &apdu, 0, 0); - exit(1); - } - if (apdu_file && !z_APDU(print, &apdu, 0, 0)) - { - odr_perror(print, "Failed to print incoming APDU"); - odr_reset(print); - continue; - } - switch(apdu->which) - { - case Z_APDU_initResponse: - process_initResponse(apdu->u.initResponse); - break; - case Z_APDU_searchResponse: - process_searchResponse(apdu->u.searchResponse); - break; - case Z_APDU_scanResponse: - process_scanResponse(apdu->u.scanResponse); - break; - case Z_APDU_presentResponse: - print_refid (apdu->u.presentResponse->referenceId); - setno += - *apdu->u.presentResponse->numberOfRecordsReturned; - if (apdu->u.presentResponse->records) - display_records(apdu->u.presentResponse->records); - else - printf("No records.\n"); - printf ("nextResultSetPosition = %d\n", - *apdu->u.presentResponse->nextResultSetPosition); - break; - case Z_APDU_sortResponse: - process_sortResponse(apdu->u.sortResponse); - break; - case Z_APDU_extendedServicesResponse: - printf("Got extended services response\n"); - process_ESResponse(apdu->u.extendedServicesResponse); - break; - case Z_APDU_close: - printf("Target has closed the association.\n"); - process_close(apdu->u.close); - break; - case Z_APDU_resourceControlRequest: - process_resourceControlRequest - (apdu->u.resourceControlRequest); - break; - case Z_APDU_deleteResultSetResponse: - process_deleteResultSetResponse(apdu->u. - deleteResultSetResponse); - break; - default: - printf("Received unknown APDU type (%d).\n", - apdu->which); - exit(1); - } - } - while (conn && cs_more(conn)); -#if HAVE_GETTIMEOFDAY - gettimeofday (&tv_end, 0); - if (1) - { - printf ("Elapsed: %.6f\n", (double) tv_end.tv_usec / - 1e6 + tv_end.tv_sec - - ((double) tv_start.tv_usec / 1e6 + tv_start.tv_sec)); - } -#endif } + if (isatty(0)) + file_history_add_line(file_history, line); + process_cmd_line(line); } - return 0; +} + +static void show_version(void) +{ + char vstr[20], sha1_str[41]; + + yaz_version(vstr, sha1_str); + printf("YAZ version: %s %s\n", YAZ_VERSION, YAZ_VERSION_SHA1); + if (strcmp(sha1_str, YAZ_VERSION_SHA1)) + printf("YAZ DLL/SO: %s %s\n", vstr, sha1_str); + exit(0); } int main(int argc, char **argv) { char *prog = *argv; + char *open_command = 0; + char *auth_command = 0; char *arg; + const char *rc_file = 0; int ret; - int opened = 0; - while ((ret = options("c:a:m:v:", argv, argc, &arg)) != -2) +#if HAVE_LOCALE_H + if (!setlocale(LC_CTYPE, "")) + fprintf(stderr, "setlocale failed\n"); +#endif +#if HAVE_LANGINFO_H +#ifdef CODESET + codeset = nl_langinfo(CODESET); +#endif +#endif + if (codeset) + outputCharset = xstrdup(codeset); + + ODR_MASK_SET(&z3950_options, Z_Options_search); + ODR_MASK_SET(&z3950_options, Z_Options_present); + ODR_MASK_SET(&z3950_options, Z_Options_namedResultSets); + ODR_MASK_SET(&z3950_options, Z_Options_triggerResourceCtrl); + ODR_MASK_SET(&z3950_options, Z_Options_scan); + ODR_MASK_SET(&z3950_options, Z_Options_sort); + ODR_MASK_SET(&z3950_options, Z_Options_extendedServices); + ODR_MASK_SET(&z3950_options, Z_Options_delSet); + + nmem_auth = nmem_create(); + + while ((ret = options("k:c:q:a:b:m:v:p:u:t:Vxd:f:", argv, argc, &arg)) != -2) { switch (ret) { case 0: - if (!opened) + if (!open_command) { - initialize (); - if (cmd_open (arg) == 2) - opened = 1; + open_command = (char *) xmalloc(strlen(arg)+6); + strcpy(open_command, "open "); + strcat(open_command, arg); } - break; - case 'm': - if (!(marcdump = fopen (arg, "a"))) + else { - perror (arg); - exit (1); + fprintf(stderr, "%s: Specify at most one server address\n", + prog); + exit(1); } break; - case 'c': - strncpy (ccl_fields, arg, sizeof(ccl_fields)-1); - ccl_fields[sizeof(ccl_fields)-1] = '\0'; - break; case 'a': if (!strcmp(arg, "-")) apdu_file=stderr; else apdu_file=fopen(arg, "a"); break; + case 'b': + if (!strcmp(arg, "-")) + ber_file=stderr; + else + ber_file=fopen(arg, "a"); + break; + case 'c': + strncpy(ccl_fields, arg, sizeof(ccl_fields)-1); + ccl_fields[sizeof(ccl_fields)-1] = '\0'; + break; + case 'd': + dump_file_prefix = arg; + break; + case 'f': + rc_file = arg; + break; + case 'k': + kilobytes = atoi(arg); + break; + case 'm': + if (!(marc_file = fopen(arg, "a"))) + { + perror(arg); + exit(1); + } + break; + case 'p': + yazProxy = xstrdup(arg); + break; + case 'q': + strncpy(cql_fields, arg, sizeof(cql_fields)-1); + cql_fields[sizeof(cql_fields)-1] = '\0'; + break; + case 't': + outputCharset = xstrdup(arg); + break; + case 'u': + if (!auth_command) + { + auth_command = (char *) xmalloc(strlen(arg)+6); + strcpy(auth_command, "auth "); + strcat(auth_command, arg); + } + break; case 'v': - yaz_log_init (yaz_log_mask_str(arg), "", NULL); + yaz_log_init(yaz_log_mask_str(arg), "", 0); + break; + case 'V': + show_version(); + break; + case 'x': + hex_dump = 1; break; default: - fprintf (stderr, "Usage: %s [-m ] [ -a ] " - "[-c cclfields] []\n", + fprintf(stderr, "Usage: %s " + " [-a apdulog]" + " [-b berdump]" + " [-c cclfile]" + " [-d dump]" + " [-f cmdfile]" + " [-k size]" + " [-m marclog]" + " [-p proxy-addr]" + " [-q cqlfile]" + " [-t dispcharset]" + " [-u auth]" + " [-v loglevel]" + " [-V]" + " [-x]" + " [server-addr]\n", prog); - exit (1); + exit(1); } } - if (!opened) - initialize (); - return client (opened); + initialize(rc_file); + if (auth_command) + { +#ifdef HAVE_GETTIMEOFDAY + gettimeofday(&tv_start, 0); +#endif + process_cmd_line(auth_command); +#if HAVE_READLINE_HISTORY_H + add_history(auth_command); +#endif + xfree(auth_command); + } + if (open_command) + { +#ifdef HAVE_GETTIMEOFDAY + gettimeofday(&tv_start, 0); +#endif + process_cmd_line(open_command); +#if HAVE_READLINE_HISTORY_H + add_history(open_command); +#endif + xfree(open_command); + } + client(); + exit_client(0); + return 0; } +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +