/*
- * Copyright (c) 1995-2000, Index Data
+ * Copyright (c) 1995-2002, Index Data
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
- * $Log: client.c,v $
- * 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 <resultset>' 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 <file>).
- *
- * 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.
+ * $Id: client.c,v 1.135 2002-01-21 12:54:06 adam Exp $
*/
#include <stdio.h>
#include <yaz/proto.h>
#include <yaz/marcdisp.h>
#include <yaz/diagbib1.h>
+#include <yaz/otherinfo.h>
#include <yaz/pquery.h>
+#include <yaz/sortspec.h>
-#ifdef ASN_COMPILED
+#if YAZ_MODULE_ill
#include <yaz/ill.h>
#endif
-#if CCL2RPN
+#if YAZ_MODULE_ccl
#include <yaz/yaz-ccl.h>
#endif
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_InitResponse *session = 0; /* session parameters */
static char last_scan_line[512] = "0";
static char last_scan_query[512] = "0";
-char* esPackageName = 0;
+static char ccl_fields[512] = "default.bib";
+static char* esPackageName = 0;
+static char* yazProxy = 0;
-static char last_cmd[100] = "?";
+static char last_cmd[32] = "?";
static FILE *marcdump = 0;
static char *refid = NULL;
static QueryType queryType = QueryType_Prefix;
-#if CCL2RPN
+#if YAZ_MODULE_ccl
static CCL_bibset bibset; /* CCL bibset handle */
#endif
+
+/* set this one to 1, to avoid decode of unknown MARCs */
+#define AVOID_MARC_DECODE 1
+
+void process_cmd_line(char* line);
+
ODR getODROutputStream()
{
return out;
odr_reset(out); /* release the APDU structure */
}
+static void print_stringn(const unsigned char *buf, size_t len)
+{
+ size_t i;
+ for (i = 0; i<len; i++)
+ if ((buf[i] <= 126 && buf[i] >= 32) || strchr ("\n\r\t\f", buf[i]))
+ fputc (buf[i], stdout);
+ else
+ printf ("\\X%02X", buf[i]);
+}
+
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");
}
}
/* 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;
req->idAuthentication = auth;
+ req->referenceId = set_refid (out);
+
+ if (yazProxy)
+ yaz_oi_set_string_oidval(&req->otherInfo, out, VAL_PROXY,
+ 1, type_and_host);
+
send_apdu(apdu);
printf("Sent initrequest.\n");
}
if (ODR_MASK_GET(res->options, Z_Options_concurrentOperations))
printf (" concurrentOperations");
if (ODR_MASK_GET(res->options, Z_Options_namedResultSets))
+ {
printf (" namedResultSets");
+ setnumber = 0;
+ }
printf ("\n");
fflush (stdout);
return 0;
{
void *add;
char type_and_host[101], base[101];
- char *host = 0;
CS_TYPE t;
if (conn)
base[0] = '\0';
if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1)
return 0;
- if (strncmp (type_and_host, "tcp:", 4) == 0)
- host = type_and_host + 4;
- else if (strncmp (type_and_host, "ssl:", 4) == 0)
- {
-#if HAVE_OPENSSL_SSL_H
- t = ssl_type;
-#else
- printf ("SSL not supported\n");
-#endif
- host = type_and_host + 4;
- }
- else
- host = type_and_host;
- if (*base)
- cmd_base (base);
- protocol = PROTO_Z3950;
- if (!(conn = cs_create(t, 1, protocol)))
- {
- perror("cs_create");
- return 0;
- }
- if (!(add = cs_straddr(conn, host)))
+ if(yazProxy)
+ conn = cs_create_host(yazProxy, 1, &add);
+ else
+ conn = cs_create_host(type_and_host, 1, &add);
+
+ if (!conn)
{
- perror(arg);
- return 0;
+ printf ("Couldn't create comstack\n");
+ return 0;
}
printf("Connecting...");
fflush(stdout);
if (cs_connect(conn, add) < 0)
{
- perror("connect");
+ printf ("error = %s\n", cs_strerror(conn));
+ if (conn->cerrno == CSYSERR)
+ perror("system");
cs_close(conn);
conn = 0;
return 0;
}
printf("Ok.\n");
- send_initRequest();
+
+ send_initRequest(type_and_host);
+ if (*base)
+ cmd_base (base);
return 2;
}
}
}
+
static void print_record(const unsigned char *buf, size_t len)
{
- size_t i;
- for (i = 0; i<len; i++)
- if ((buf[i] <= 126 && buf[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')
+ size_t i = len;
+ print_stringn (buf, len);
+ /* 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);
record_last = r;
/*
* Call the given decoder to process the record.
*/
- odr_setbuf(in, (char*)p->u.octet_aligned->buf,
- p->u.octet_aligned->len, 0);
+ odr_setbuf(in, (char*)r->u.octet_aligned->buf,
+ r->u.octet_aligned->len, 0);
if (!(*type->fun)(in, (char **)&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);
+ odr_dumpBER(stderr, (char*)r->u.octet_aligned->buf,
+ r->u.octet_aligned->len);
fprintf(stderr, "---------\n");
exit(1);
}
}
}
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)
+ print_record((const unsigned char *) r->u.octet_aligned->buf,
+ r->u.octet_aligned->len);
+ else if (r->which == Z_External_octet && r->u.octet_aligned->len)
{
- const char *octet_buf = (char*)p->u.octet_aligned->buf;
+ const char *octet_buf = (char*)r->u.octet_aligned->buf;
if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML ||
ent->value == VAL_HTML)
print_record((const unsigned char *) octet_buf,
- p->u.octet_aligned->len);
+ r->u.octet_aligned->len);
else
{
- if (marc_display (octet_buf, NULL) <= 0)
+ if (
+#if AVOID_MARC_DECODE
+ /* primitive check for a marc OID 5.1-29 */
+ ent->oidsuffix[0] == 5 && ent->oidsuffix[1] < 30
+#else
+ 1
+#endif
+ )
+ {
+ if (marc_display_exl (octet_buf, NULL, 0 /* debug */,
+ r->u.octet_aligned->len) <= 0)
+ {
+ printf ("bad MARC. Dumping as it is:\n");
+ print_record((const unsigned char*) octet_buf,
+ r->u.octet_aligned->len);
+ }
+ }
+ 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);
+ fwrite (octet_buf, 1, r->u.octet_aligned->len, marcdump);
}
else if (ent && ent->value == VAL_SUTRS)
{
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
switch (r->which)
{
case Z_DefaultDiagFormat_v2Addinfo:
printf (" -- v3 addinfo '%s'\n", r->u.v3Addinfo);
break;
}
-#else
- if (r->addinfo && *r->addinfo)
- printf(" -- '%s'\n", r->addinfo);
- else
- printf("\n");
-#endif
}
}
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
}
else if (p->which == Z_Records_multipleNSD)
display_diagrecs (p->u.multipleNonSurDiagnostics->diagRecs,
Z_SearchRequest *req = apdu->u.searchRequest;
Z_Query query;
int oid[OID_SIZE];
-#if CCL2RPN
+#if YAZ_MODULE_ccl
struct ccl_rpn_node *rpn = NULL;
int error, pos;
#endif
Z_RPNQuery *RPNquery;
Odr_oct ccl_query;
-#if CCL2RPN
+#if YAZ_MODULE_ccl
if (queryType == QueryType_CCL2RPN)
{
rpn = ccl_find_str(bibset, arg, &error, &pos);
ccl_query.buf = (unsigned char*) arg;
ccl_query.len = strlen(arg);
break;
-#if CCL2RPN
+#if YAZ_MODULE_ccl
case QueryType_CCL2RPN:
query.which = Z_Query_type_1;
RPNquery = ccl_rpn_query(out, rpn);
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",
+ printf("Number of hits: %d", *res->resultCount);
+ if (setnumber >= 0)
+ printf (", setno %d", setnumber);
+ printf("\nrecords returned: %d\n",
*res->numberOfRecordsReturned);
setno += *res->numberOfRecordsReturned;
if (res->records)
void process_ESResponse(Z_ExtendedServicesResponse *res)
{
- printf("process_ESResponse status=");
+ printf("Status: ");
switch (*res->operationStatus)
{
case Z_ExtendedServicesResponse_done:
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;
+
+ 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;
+
+ for (i = 0; i<targetPart->num_taskPackageRecords; i++)
+ {
+
+ 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");
+ }
+ }
+ }
+ }
}
}
-#ifdef ASN_COMPILED
+#if YAZ_MODULE_ill
const char *get_ill_element (void *clientData, const char *element)
{
- printf ("%s\n", element);
return 0;
}
r->u.single_ASN1_type = (Odr_oct *)
odr_malloc (out, sizeof(*r->u.single_ASN1_type));
- r->u.single_ASN1_type->buf = odr_malloc (out, item_request_size);
+ r->u.single_ASN1_type->buf = (unsigned char *)
+ 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,
}
return r;
}
-#else
-static Z_External *create_external_itemRequest()
-{
- return 0;
-}
#endif
-#ifdef ASN_COMPILED
-static Z_External *create_external_ILLRequest()
+#ifdef YAZ_MODULE_ill
+static Z_External *create_external_ILL_APDU(int which)
{
struct ill_get_ctl ctl;
- ILL_Request *req;
+ ILL_APDU *ill_apdu;
Z_External *r = 0;
int ill_request_size = 0;
char *ill_request_buf = 0;
ctl.clientData = 0;
ctl.f = get_ill_element;
- req = ill_get_ILLRequest(&ctl, "ill", 0);
+ ill_apdu = ill_get_APDU(&ctl, "ill", 0);
- if (!ill_Request (out, &req, 0, 0))
+ if (!ill_APDU (out, &ill_apdu, 0, 0))
{
if (apdu_file)
{
printf ("-------------------\n");
- ill_Request(print, &req, 0, 0);
+ ill_APDU(print, &ill_apdu, 0, 0);
odr_reset(print);
printf ("-------------------\n");
}
r->u.single_ASN1_type = (Odr_oct *)
odr_malloc (out, sizeof(*r->u.single_ASN1_type));
- r->u.single_ASN1_type->buf = odr_malloc (out, ill_request_size);
+ r->u.single_ASN1_type->buf = (unsigned char *)
+ 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);
}
return r;
}
-#else
-static Z_External *create_external_ILLRequest()
-{
- return 0;
-}
#endif
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 *)
odr_malloc(out,sizeof(Z_IORequest));
(int *) odr_malloc(out, sizeof(int));
*r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno;
+#if YAZ_MODULE_ill
if (!strcmp (type, "item") || !strcmp(type, "2"))
{
printf ("using item-request\n");
{
printf ("using ILL-request\n");
r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
- create_external_ILLRequest();
+ create_external_ILL_APDU(ILL_APDU_ILL_Request);
+ }
+ else if (!strcmp(type, "xml") || !strcmp(type, "3"))
+ {
+ const char *xml_buf =
+ "<itemorder>\n"
+ " <type>request</type>\n"
+ " <libraryNo>000200</libraryNo>\n"
+ " <borrowerTicketNo> 1212 </borrowerTicketNo>\n"
+ "</itemorder>";
+ r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
+ z_ext_record (out, VAL_TEXT_XML, xml_buf, strlen(xml_buf));
}
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)
{
- Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest );
+ Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest);
Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
oident ItemOrderRequest;
oid_ent_to_oid (&update_oid, oid);
req->packageType = odr_oiddup(out,oid);
req->packageName = esPackageName;
+
+ req->referenceId = set_refid (out);
r = req->taskSpecificParameters = (Z_External *)
odr_malloc (out, sizeof(*r));
static int cmd_setnames(char *arg)
{
- if (setnumber < 0)
- {
- printf("Set numbering enabled.\n");
+ if (*arg == '1') /* enable ? */
+ setnumber = 0;
+ else if (*arg == '0') /* disable ? */
+ setnumber = -1;
+ else if (setnumber < 0) /* no args, toggle .. */
setnumber = 0;
- }
else
- {
- printf("Set numbering disabled.\n");
setnumber = -1;
- }
+
+ if (setnumber >= 0)
+ printf("Set numbering enabled.\n");
+ else
+ printf("Set numbering disabled.\n");
return 1;
}
int cmd_quit(char *arg)
{
printf("See you later, alligator.\n");
+ xmalloc_trav ("");
exit(0);
return 0;
}
Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest);
Z_ScanRequest *req = apdu->u.scanRequest;
int use_rpn = 1;
+#if YAZ_MODULE_ccl
int oid[OID_SIZE];
-#if CCL2RPN
if (queryType == QueryType_CCL2RPN)
{
oident bib1;
if (error)
{
printf("CCL ERROR: %s\n", ccl_err_msg(error));
- return 0;
+ return -1;
}
use_rpn = 0;
bib1.proto = PROTO_Z3950;
if (!(req->termListAndStartPoint = ccl_scan_query (out, rpn)))
{
printf("Couldn't convert CCL to Scan term\n");
- return 0;
+ return -1;
}
ccl_rpn_delete (rpn);
}
req->termListAndStartPoint->term->u.general)
{
req->termListAndStartPoint->term->u.general->buf =
- odr_strdup(out, term);
+ (unsigned char *) odr_strdup(out, term);
req->termListAndStartPoint->term->u.general->len =
req->termListAndStartPoint->term->u.general->size =
strlen(term);
Z_SortKeySpecList *sksl = (Z_SortKeySpecList *)
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 (setnumber >= 0)
sprintf (setstring, "%d", setnumber);
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
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;
-
-#ifdef ASN_COMPILED
- sks->which = Z_SortKeySpec_null;
- sks->u.null = odr_nullval ();
-#else
- sks->missingValueAction = NULL;
-#endif
-
- 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");
return -1;
}
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)
queryType = QueryType_CCL;
else if (!strcmp (arg, "prefix") || !strcmp(arg, "rpn"))
queryType = QueryType_Prefix;
-#if CCL2RPN
+#if YAZ_MODULE_ccl
else if (!strcmp (arg, "ccl2rpn") || !strcmp (arg, "cclrpn"))
queryType = QueryType_CCL2RPN;
#endif
printf ("Querytype must be one of:\n");
printf (" prefix - Prefix query\n");
printf (" ccl - CCL query\n");
-#if CCL2RPN
+#if YAZ_MODULE_ccl
printf (" ccl2rpn - CCL query converted to RPN\n");
#endif
return 0;
return 1;
};
+int cmd_proxy(char* arg) {
+ xfree (yazProxy);
+ yazProxy = NULL;
+ if (*arg)
+ {
+ yazProxy = (char *) xmalloc (strlen(arg)+1);
+ strcpy (yazProxy, arg);
+ }
+ return 1;
+};
+
+int cmd_source(char* arg)
+{
+ /* first should open the file and read one line at a time.. */
+ FILE* includeFile;
+ char line[1024], *cp;
+
+ if(strlen(arg)<1) {
+ fprintf(stderr,"Error in source command use a filename");
+ return -1;
+ };
+
+ includeFile = fopen (arg, "r");
+
+ if(!includeFile) {
+ fprintf(stderr,"Unable to open file %s for reading\n",arg);
+ return -1;
+ };
+
+
+ while(!feof(includeFile)) {
+ memset(line,0,sizeof(line));
+ fgets(line,sizeof(line),includeFile);
+
+ if(strlen(line) < 2) continue;
+ if(line[0] == '#') continue;
+
+ if ((cp = strrchr (line, '\n')))
+ *cp = '\0';
+
+ process_cmd_line(line);
+ };
+
+
+ if(fclose(includeFile)<0) {
+ perror("unable to close include file");
+ exit(1);
+ }
+ return 1;
+}
+
+int cmd_subshell(char* args) {
+ system(args);
+ return 1;
+}
+
static void initialize(void)
{
-#if CCL2RPN
+#if YAZ_MODULE_ccl
FILE *inf;
#endif
- nmem_init();
if (!(out = odr_createmem(ODR_ENCODE)) ||
!(in = odr_createmem(ODR_DECODE)) ||
!(print = odr_createmem(ODR_PRINT)))
if (apdu_file)
odr_setprint(print, apdu_file);
-#if CCL2RPN
+#if YAZ_MODULE_ccl
bibset = ccl_qual_mk ();
- inf = fopen ("default.bib", "r");
+ inf = fopen (ccl_fields, "r");
if (inf)
{
ccl_qual_file (bibset, inf);
cmd_base("Default");
}
-static int client(int wait)
+
+#if HAVE_GETTIMEOFDAY
+struct timeval tv_start, tv_end;
+#endif
+
+void wait_and_handle_responce()
+{
+
+ int res;
+ char *netbuffer= 0;
+ int netbufferlen = 0;
+ Z_APDU *apdu;
+
+
+ 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 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
+ }
+}
+
+void process_cmd_line(char* line)
{
static struct {
char *cmd;
int (*fun)(char *arg);
char *ad;
} cmd[] = {
- {"open", cmd_open, "('tcp'|'osi')':'[<tsel>'/']<host>[':'<port>]"},
+ {"open", cmd_open, "('tcp'|'ssl')':<host>[':'<port>][/<db>]"},
{"quit", cmd_quit, ""},
{"find", cmd_find, "<query>"},
{"delete", cmd_delete, "<setname>"},
{"itemorder", cmd_itemorder, "ill|item <itemno>"},
{"update", cmd_update, "<item>"},
{"packagename", cmd_packagename, "<packagename>"},
-#ifdef ASN_COMPILED
+ {"proxy", cmd_proxy, "('tcp'|'osi')':'[<tsel>'/']<host>[':'<port>]"},
+ {".", cmd_source, "<filename>"},
+ {"!", cmd_subshell, "Subshell command"},
/* Server Admin Functions */
{"adm-reindex", cmd_adm_reindex, "<database-name>"},
{"adm-truncate", cmd_adm_truncate, "('database'|'index')<object-name>"},
{"adm-commit", cmd_adm_commit, ""},
{"adm-shutdown", cmd_adm_shutdown, ""},
{"adm-startup", cmd_adm_startup, ""},
-#endif
{0,0}
};
- char *netbuffer= 0;
- int netbufferlen = 0;
- int i;
- Z_APDU *apdu;
+ int i,res;
+ char word[32], arg[1024];
+
+
+#if HAVE_GETTIMEOFDAY
+ gettimeofday (&tv_start, 0);
+#endif
+
+ if ((res = sscanf(line, "%31s %1023[^;]", 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);
+ return;
+ }
+ if (res >= 2)
+ wait_and_handle_responce();
+}
+
+
+
+static void client(void)
+{
+
#if HAVE_GETTIMEOFDAY
- struct timeval tv_start, tv_end;
gettimeofday (&tv_start, 0);
#endif
while (1)
{
- int res;
#ifdef USE_SELECT
fd_set input;
#endif
- char line[1024], word[1024], arg[1024];
+ char line[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
{
#if HAVE_READLINE_READLINE_H
char* line_in;
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
- }
+ process_cmd_line(line);
+ }
}
- return 0;
}
int main(int argc, char **argv)
{
char *prog = *argv;
+ char *open_command = 0;
+ char *auth_command = 0;
char *arg;
int ret;
- int opened = 0;
- while ((ret = options("a:m:v:", argv, argc, &arg)) != -2)
+ while ((ret = options("c:a:m:v:p:u:", argv, argc, &arg)) != -2)
{
switch (ret)
{
case 0:
- if (!opened)
+ if (!open_command)
{
- initialize ();
- if (cmd_open (arg) == 2)
- opened = 1;
+ open_command = xmalloc (strlen(arg)+6);
+ strcpy (open_command, "open ");
+ strcat (open_command, arg);
}
break;
case 'm':
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 'p':
+ yazProxy=strdup(arg);
+ break;
+ case 'u':
+ if (!auth_command)
+ {
+ auth_command = xmalloc (strlen(arg)+6);
+ strcpy (auth_command, "auth ");
+ strcat (auth_command, arg);
+ }
+ break;
case 'v':
yaz_log_init (yaz_log_mask_str(arg), "", NULL);
break;
default:
fprintf (stderr, "Usage: %s [-m <marclog>] [ -a <apdulog>] "
- "[<server-addr>]\n",
+ "[-c cclfields]\n [-p <proxy-addr>] [-u <auth>] "
+ "[<server-addr>]\n",
prog);
exit (1);
}
}
- if (!opened)
- initialize ();
- return client (opened);
+ initialize();
+ 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 (0);
}