/*
- * Copyright (c) 1995-2000, Index Data
+ * Copyright (c) 1995-2001, Index Data
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: client.c,v $
- * 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.
*
+ * $Id: client.c,v 1.127 2001-08-08 19:35:06 adam Exp $
*
*/
#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
static int sent_close = 0;
static NMEM session_mem = NULL; /* memory handle for init-response */
static Z_InitResponse *session = 0; /* session parameters */
-static char last_scan[512] = "0";
-static char last_cmd[100] = "?";
+static char last_scan_line[512] = "0";
+static char last_scan_query[512] = "0";
+static char ccl_fields[512] = "default.bib";
+static char* esPackageName = 0;
+static char* yazProxy = 0;
+
+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
{
if (id)
{
- printf ("ReferenceId: '%.*s'\n", id->len, id->buf);
+ printf ("ReferenceId: '%.*s'\n", id->len, id->buf);
}
}
{
Z_ReferenceId *id;
if (!refid)
- return 0;
+ return 0;
id = (Z_ReferenceId *) odr_malloc (out, sizeof(*id));
id->size = id->len = strlen(refid);
id->buf = (unsigned char *) odr_malloc (out, id->len);
/* 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");
}
printf("Guessing visiblestring:\n");
printf("'%s'\n", res->userInformationField->u. octet_aligned->buf);
}
- odr_reset (print);
- }
+ 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");
+ if (ODR_MASK_GET(res->options, Z_Options_namedResultSets))
+ printf (" namedResultSets");
+ printf ("\n");
+ fflush (stdout);
return 0;
}
int cmd_open(char *arg)
{
void *add;
- char type[100], addr[100], base[100];
+ char type_and_host[101], base[101];
CS_TYPE t;
if (conn)
{
printf("Already connected.\n");
- cs_close (conn);
- conn = NULL;
- if (session_mem)
- {
- nmem_destroy (session_mem);
- session_mem = NULL;
- }
+ cs_close (conn);
+ conn = NULL;
+ if (session_mem)
+ {
+ nmem_destroy (session_mem);
+ session_mem = NULL;
+ }
}
+ t = tcpip_type;
base[0] = '\0';
- if (!*arg || sscanf(arg, "%[^:]:%[^/]/%s", type, addr, base) < 2)
- {
- fprintf(stderr, "Usage: open (osi|tcp) ':' [tsel '/']host[':'port]\n");
+ if (sscanf (arg, "%100[^/]/%100s", type_and_host, base) < 1)
return 0;
- }
- if (*base)
- cmd_base (base);
- if (!strcmp(type, "tcp"))
- {
- t = tcpip_type;
- protocol = PROTO_Z3950;
- }
- else
-#ifdef USE_XTIMOSI
- if (!strcmp(type, "osi"))
- {
- t = mosi_type;
- protocol = PROTO_SR;
- }
- else
-#endif
- {
- fprintf(stderr, "Bad type: %s\n", type);
- return 0;
- }
- if (!(conn = cs_create(t, 1, protocol)))
+
+ if(yazProxy)
{
- perror("cs_create");
- return 0;
+ conn = cs_create_host(yazProxy, 1, &add);
+ }
+ else
+ {
+ conn = cs_create_host(type_and_host, 1, &add);
}
- if (!(add = cs_straddr(conn, addr)))
+
+ if (!conn)
{
- perror(arg);
+ 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;
}
for (i = 0; i < v->num_triples; i++)
{
- 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");
+ 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");
}
}
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)
- {
- 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");
- else
+ printf("%d\n", *t->content->u.numeric);
+ else if (t->content->which == Z_ElementData_oid)
+ {
+ 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");
+ else
printf("??????\n");
- if (t->appliedVariant)
- display_variant(t->appliedVariant, level+1);
- if (t->metaData && t->metaData->supportedVariants)
- {
- int c;
+ 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);
- }
- }
+ 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);
+ }
+ }
}
}
/* Check if this is a known, ASN.1 type tucked away in an octet string */
if (ent && r->which == Z_External_octet)
{
- Z_ext_typeent *type = z_ext_getentbyref(ent->value);
- void *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_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);
- }
- /*
- * 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;
- }
+ Z_ext_typeent *type = z_ext_getentbyref(ent->value);
+ void *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_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);
+ }
+ /*
+ * 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)
{
const char *octet_buf = (char*)p->u.octet_aligned->buf;
- if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML ||
+ 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);
- else
+ else
{
if (marc_display (octet_buf, NULL) <= 0)
{
printf("Diagnostic message(s) from database:\n");
for (i = 0; i<num; i++)
{
- Z_DiagRec *p = pp[i];
- if (p->which != Z_DiagRec_defaultFormat)
- {
- printf("Diagnostic record not in default format.\n");
- return;
- }
- 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));
+ Z_DiagRec *p = pp[i];
+ if (p->which != Z_DiagRec_defaultFormat)
+ {
+ printf("Diagnostic record not in default format.\n");
+ return;
+ }
+ 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
- switch (r->which)
- {
- case Z_DefaultDiagFormat_v2Addinfo:
- printf (" -- v2 addinfo '%s'\n", r->u.v2Addinfo);
- break;
- case Z_DefaultDiagFormat_v3Addinfo:
- printf (" -- v3 addinfo '%s'\n", r->u.v3Addinfo);
- break;
- }
+ switch (r->which)
+ {
+ case Z_DefaultDiagFormat_v2Addinfo:
+ printf (" -- v2 addinfo '%s'\n", r->u.v2Addinfo);
+ break;
+ case Z_DefaultDiagFormat_v3Addinfo:
+ printf (" -- v3 addinfo '%s'\n", r->u.v3Addinfo);
+ break;
+ }
#else
- if (r->addinfo && *r->addinfo)
- printf(" -- '%s'\n", r->addinfo);
- else
- printf("\n");
+ 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);
+ 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);
+ display_diagrecs (&p->u.nonSurrogateDiagnostic, 1);
#endif
}
else if (p->which == Z_Records_multipleNSD)
- display_diagrecs (p->u.multipleNonSurDiagnostics->diagRecs,
- p->u.multipleNonSurDiagnostics->num_diagRecs);
+ display_diagrecs (p->u.multipleNonSurDiagnostics->diagRecs,
+ p->u.multipleNonSurDiagnostics->num_diagRecs);
else
{
printf("Records: %d\n", p->u.databaseOrSurDiagnostics->num_records);
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));
+ odr_malloc (out, sizeof(*req->deleteFunction));
if (req->num_resultSetList > 0)
{
- *req->deleteFunction = Z_DeleteRequest_list;
- req->resultSetList = (char **)
- odr_malloc (out, sizeof(*req->resultSetList)*
- req->num_resultSetList);
- for (i = 0; i<req->num_resultSetList; i++)
- req->resultSetList[i] = names[i];
+ *req->deleteFunction = Z_DeleteRequest_list;
+ req->resultSetList = (char **)
+ odr_malloc (out, sizeof(*req->resultSetList)*
+ req->num_resultSetList);
+ for (i = 0; i<req->num_resultSetList; i++)
+ req->resultSetList[i] = names[i];
}
else
{
- *req->deleteFunction = Z_DeleteRequest_all;
- req->resultSetList = 0;
+ *req->deleteFunction = Z_DeleteRequest_all;
+ req->resultSetList = 0;
}
send_apdu(apdu);
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;
- oident bib1;
#endif
char setstring[100];
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);
- if (!RPNquery)
- {
- printf ("Couldn't convert from CCL to RPN\n");
- return 0;
- }
- bib1.proto = protocol;
- bib1.oclass = CLASS_ATTSET;
- bib1.value = VAL_BIB1;
- RPNquery->attributeSetId = oid_ent_to_oid(&bib1, oid);
+ if (!RPNquery)
+ {
+ printf ("Couldn't convert from CCL to RPN\n");
+ return 0;
+ }
query.u.type_1 = RPNquery;
ccl_rpn_delete (rpn);
break;
switch (*res->operationStatus)
{
case Z_ExtendedServicesResponse_done:
- printf ("done\n");
- break;
+ printf ("done\n");
+ break;
case Z_ExtendedServicesResponse_accepted:
- printf ("accepted\n");
- break;
+ printf ("accepted\n");
+ break;
case Z_ExtendedServicesResponse_failure:
- printf ("failure\n");
- display_diagrecs(res->diagnostics, res->num_diagnostics);
- break;
+ printf ("failure\n");
+ display_diagrecs(res->diagnostics, res->num_diagnostics);
+ break;
}
+ if ( (*res->operationStatus != Z_ExtendedServicesResponse_failure) &&
+ (res->num_diagnostics != 0) ) {
+ display_diagrecs(res->diagnostics, res->num_diagnostics);
+ }
+
}
-#ifdef ASN_COMPILED
+#if YAZ_MODULE_ill
const char *get_ill_element (void *clientData, const char *element)
{
- /* printf ("asking for %s\n", element); */
- if (!strcmp (element, "ill,transaction-id,transaction-group-qualifier"))
- return "1";
- if (!strcmp (element, "ill,transaction-id,transaction-qualifier"))
- return "1";
+ printf ("%s\n", element);
return 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))
{
- if (apdu_file)
- {
- ill_ItemRequest(print, &req, 0, 0);
- odr_reset(print);
- }
- item_request_buf = odr_getbuf (out, &item_request_size, 0);
- if (item_request_buf)
- odr_setbuf (out, item_request_buf, item_request_size, 1);
+ if (apdu_file)
+ {
+ ill_ItemRequest(print, &req, 0, 0);
+ odr_reset(print);
+ }
+ 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);
- return 0;
+ 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->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));
- r->u.single_ASN1_type->buf = 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,
- item_request_size);
- printf ("len = %d\n", item_request_size);
+ 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->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));
+ 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,
+ item_request_size);
+ printf ("len = %d\n", item_request_size);
}
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.odr = out;
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);
- odr_reset(print);
- 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);
+ if (apdu_file)
+ {
+ printf ("-------------------\n");
+ ill_APDU(print, &ill_apdu, 0, 0);
+ odr_reset(print);
+ 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);
- return 0;
+ 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->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));
- r->u.single_ASN1_type->buf = 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);
+ 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->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));
+ 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);
+ printf ("len = %d\n", ill_request_size);
}
return r;
}
-#else
-static Z_External *create_external_ILLRequest()
-{
- return 0;
-}
#endif
#endif
r->u.itemOrder->u.esRequest = (Z_IORequest *)
- odr_malloc(out,sizeof(Z_IORequest));
+ odr_malloc(out,sizeof(Z_IORequest));
memset(r->u.itemOrder->u.esRequest, 0, sizeof(Z_IORequest));
r->u.itemOrder->u.esRequest->toKeep = (Z_IOOriginPartToKeep *)
- odr_malloc(out,sizeof(Z_IOOriginPartToKeep));
+ odr_malloc(out,sizeof(Z_IOOriginPartToKeep));
memset(r->u.itemOrder->u.esRequest->toKeep, 0, sizeof(Z_IOOriginPartToKeep));
r->u.itemOrder->u.esRequest->notToKeep = (Z_IOOriginPartNotToKeep *)
- odr_malloc(out,sizeof(Z_IOOriginPartNotToKeep));
+ odr_malloc(out,sizeof(Z_IOOriginPartNotToKeep));
memset(r->u.itemOrder->u.esRequest->notToKeep, 0, sizeof(Z_IOOriginPartNotToKeep));
r->u.itemOrder->u.esRequest->toKeep->supplDescription = NULL;
r->u.itemOrder->u.esRequest->toKeep->addlBilling = NULL;
r->u.itemOrder->u.esRequest->notToKeep->resultSetItem =
- (Z_IOResultSetItem *) odr_malloc(out, sizeof(Z_IOResultSetItem));
+ (Z_IOResultSetItem *) odr_malloc(out, sizeof(Z_IOResultSetItem));
memset(r->u.itemOrder->u.esRequest->notToKeep->resultSetItem, 0, sizeof(Z_IOResultSetItem));
r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->resultSetId = "1";
r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item =
- (int *) odr_malloc(out, sizeof(int));
+ (int *) odr_malloc(out, sizeof(int));
*r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno;
- switch (*type)
- {
- case '2':
- printf ("using item-request\n");
- r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
- create_external_itemRequest();
- break;
- case '1':
- printf ("using ILL-request\n");
- r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
- create_external_ILLRequest();
- break;
- default:
- r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0;
+#if YAZ_MODULE_ill
+ if (!strcmp (type, "item") || !strcmp(type, "2"))
+ {
+ 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 =
+ 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;
ItemOrderRequest.oclass = CLASS_EXTSERV;
ItemOrderRequest.value = VAL_ITEMORDER;
req->packageType = odr_oiddup(out,oid_getoidbyent(&ItemOrderRequest));
- req->packageName = "1.Extendedserveq";
+ req->packageName = esPackageName;
req->taskSpecificParameters = create_ItemOrderExternal(type, itemno);
fflush(stdout);
if (!record_last)
- return 0;
+ 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 = "1.Extendedserveq";
+ req->packageName = esPackageName;
+
+ req->referenceId = set_refid (out);
r = req->taskSpecificParameters = (Z_External *)
- odr_malloc (out, sizeof(*r));
+ odr_malloc (out, sizeof(*r));
r->direct_reference = odr_oiddup(out,oid);
r->indirect_reference = 0;
r->descriptor = 0;
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));
+ 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));
+ odr_malloc(out, sizeof(*r->u.update->u.esRequest->toKeep));
toKeep->databaseName = databaseNames[0];
toKeep->schema = 0;
toKeep->elementSetName = 0;
*toKeep->action = Z_IUOriginPartToKeep_recordInsert;
notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *)
- odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep));
+ odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep));
notToKeep->num = 1;
notToKeep->elements = (Z_IUSuppliedRecords_elem **)
- odr_malloc(out, sizeof(*notToKeep->elements));
+ odr_malloc(out, sizeof(*notToKeep->elements));
notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *)
- odr_malloc(out, sizeof(**notToKeep->elements));
+ odr_malloc(out, sizeof(**notToKeep->elements));
notToKeep->elements[0]->u.number = 0;
notToKeep->elements[0]->supplementalId = 0;
notToKeep->elements[0]->correlationInfo = 0;
int itemno;
if (sscanf (arg, "%10s %d", type, &itemno) != 2)
- return 0;
+ return 0;
printf("Item order request\n");
fflush(stdout);
#if 0
if (1)
{
- static Z_Range range;
- static Z_Range *rangep = ⦥
+ static Z_Range range;
+ static Z_Range *rangep = ⦥
req->num_ranges = 1;
#endif
req->resultSetStartPoint = &setno;
prefsyn.oclass = CLASS_RECSYN;
prefsyn.value = recordsyntax;
req->preferredRecordSyntax =
- odr_oiddup (out, oid_ent_to_oid(&prefsyn, oid));
+ odr_oiddup (out, oid_ent_to_oid(&prefsyn, oid));
if (schema != VAL_NONE)
{
prefschema.oclass = CLASS_SCHEMA;
prefschema.value = schema;
- 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 *)
- 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)
- {
- /* 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));
- }
- if (!elementSetNames)
- compo.u.complex->generic->elementSpec = 0;
- else
- {
- compo.u.complex->generic->elementSpec = (Z_ElementSpec *)
- odr_malloc(out, sizeof(Z_ElementSpec));
- compo.u.complex->generic->elementSpec->which =
- Z_ElementSpec_elementSetName;
- compo.u.complex->generic->elementSpec->u.elementSetName =
- elementSetNames->u.generic;
- }
- compo.u.complex->num_dbSpecific = 0;
- compo.u.complex->dbSpecific = 0;
- compo.u.complex->num_recordSyntax = 0;
- compo.u.complex->recordSyntax = 0;
+ 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 *)
+ 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)
+ {
+ /* 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));
+ }
+ if (!elementSetNames)
+ compo.u.complex->generic->elementSpec = 0;
+ else
+ {
+ compo.u.complex->generic->elementSpec = (Z_ElementSpec *)
+ odr_malloc(out, sizeof(Z_ElementSpec));
+ compo.u.complex->generic->elementSpec->which =
+ Z_ElementSpec_elementSetName;
+ compo.u.complex->generic->elementSpec->u.elementSetName =
+ elementSetNames->u.generic;
+ }
+ compo.u.complex->num_dbSpecific = 0;
+ compo.u.complex->dbSpecific = 0;
+ compo.u.complex->num_recordSyntax = 0;
+ compo.u.complex->recordSyntax = 0;
}
else if (elementSetNames)
{
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;
+ cs_close (conn);
+ conn = NULL;
+ if (session_mem)
+ {
+ nmem_destroy (session_mem);
+ session_mem = NULL;
+ }
+ sent_close = 0;
}
else
{
- *res->closeReason = Z_Close_finished;
- send_apdu(apdu);
- printf("Sent response.\n");
- sent_close = 1;
+ *res->closeReason = Z_Close_finished;
+ send_apdu(apdu);
+ printf("Sent response.\n");
+ sent_close = 1;
}
}
return 2;
}
-int send_scanrequest(char *string, int pp, int num)
+int send_scanrequest(const char *query, int pp, int num, const char *term)
{
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 (!(req->termListAndStartPoint =
- p_query_scan(out, protocol, &req->attributeSet, string)))
+ if (queryType == QueryType_CCL2RPN)
{
- printf("Prefix query error\n");
- return -1;
+ oident bib1;
+ int error, pos;
+ struct ccl_rpn_node *rpn;
+
+ 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)))
+ {
+ printf("Couldn't convert CCL to Scan term\n");
+ return -1;
+ }
+ ccl_rpn_delete (rpn);
+ }
+#endif
+ if (use_rpn && !(req->termListAndStartPoint =
+ p_query_scan(out, protocol, &req->attributeSet, query)))
+ {
+ printf("Prefix query error\n");
+ return -1;
+ }
+ if (term && *term)
+ {
+ if (req->termListAndStartPoint->term &&
+ req->termListAndStartPoint->term->which == Z_Term_general &&
+ req->termListAndStartPoint->term->u.general)
+ {
+ req->termListAndStartPoint->term->u.general->buf =
+ (unsigned char *) odr_strdup(out, term);
+ req->termListAndStartPoint->term->u.general->len =
+ req->termListAndStartPoint->term->u.general->size =
+ strlen(term);
+ }
}
req->referenceId = set_refid (out);
req->num_databaseNames = num_databaseNames;
Z_SortKeySpecList *sksl = (Z_SortKeySpecList *)
odr_malloc (out, sizeof(*sksl));
char setstring[32];
- char sort_string[32], sort_flags[32];
- int off;
- int oid[OID_SIZE];
- oident bib1;
if (setnumber >= 0)
- sprintf (setstring, "%d", setnumber);
+ sprintf (setstring, "%d", setnumber);
else
- sprintf (setstring, "default");
+ sprintf (setstring, "default");
req->referenceId = set_refid (out);
#ifdef ASN_COMPILED
req->num_inputResultSetNames = 1;
req->inputResultSetNames = (Z_InternationalString **)
- odr_malloc (out, sizeof(*req->inputResultSetNames));
+ odr_malloc (out, sizeof(*req->inputResultSetNames));
req->inputResultSetNames[0] = odr_strdup (out, setstring);
#else
req->inputResultSetNames =
- (Z_StringList *)odr_malloc (out, sizeof(*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));
+ (char **)odr_malloc (out, sizeof(*req->inputResultSetNames->strings));
req->inputResultSetNames->strings[0] =
- odr_strdup (out, setstring);
+ odr_strdup (out, setstring);
#endif
if (newset && setnumber >= 0)
- sprintf (setstring, "%d", ++setnumber);
+ 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, sort_flags, &off)) == 2
- && off > 1)
- {
- int i;
- char *sort_string_sep;
- 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, '=')))
- {
- Z_AttributeElement *el = (Z_AttributeElement *)odr_malloc (out, sizeof(*el));
- 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->num_attributes = 1;
- sk->u.sortAttributes->list->attributes =
- (Z_AttributeElement **)odr_malloc (out,
- sizeof(*sk->u.sortAttributes->list->attributes));
- sk->u.sortAttributes->list->attributes[0] = 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);
- }
- 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;
+ return -1;
}
send_apdu(apdu);
return 2;
{
if (t->term->which == Z_Term_general)
{
- printf("%.*s (%d)\n", t->term->u.general->len, t->term->u.general->buf,
- t->globalOccurrences ? *t->globalOccurrences : -1);
- sprintf(last_scan, "%.*s", t->term->u.general->len,
+ 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 type not general.\n");
+ printf("Term (not general)");
+ if (t->globalOccurrences)
+ printf (" (%d)\n", *t->globalOccurrences);
+ else
+ printf ("\n");
}
void process_scanResponse(Z_ScanResponse *res)
print_refid (res->referenceId);
printf("%d entries", *res->numberOfEntriesReturned);
if (res->positionOfTerm)
- printf (", position=%d", *res->positionOfTerm);
+ printf (", position=%d", *res->positionOfTerm);
printf ("\n");
if (*res->scanStatus != Z_Scan_success)
printf("Scan returned code %d\n", *res->scanStatus);
if (!res->entries)
return;
if ((entries = res->entries->entries))
- num_entries = res->entries->num_entries;
+ num_entries = res->entries->num_entries;
for (i = 0; i < num_entries; i++)
{
int pos_term = res->positionOfTerm ? *res->positionOfTerm : -1;
- if (entries[i]->which == Z_Entry_termInfo)
- {
- printf("%c ", i + 1 == pos_term ? '*' : ' ');
- display_term(entries[i]->u.termInfo);
- }
- else
- display_diagrecs(&entries[i]->u.surrogateDiagnostic, 1);
+ if (entries[i]->which == Z_Entry_termInfo)
+ {
+ printf("%c ", i + 1 == pos_term ? '*' : ' ');
+ display_term(entries[i]->u.termInfo);
+ }
+ else
+ display_diagrecs(&entries[i]->u.surrogateDiagnostic, 1);
}
if (res->entries->nonsurrogateDiagnostics)
- display_diagrecs (res->entries->nonsurrogateDiagnostics,
- res->entries->num_nonsurrogateDiagnostics);
+ display_diagrecs (res->entries->nonsurrogateDiagnostics,
+ res->entries->num_nonsurrogateDiagnostics);
}
void process_sortResponse(Z_SortResponse *res)
switch (*res->sortStatus)
{
case Z_SortStatus_success:
- printf ("success"); break;
+ printf ("success"); break;
case Z_SortStatus_partial_1:
- printf ("partial"); break;
+ printf ("partial"); break;
case Z_SortStatus_failure:
- printf ("failure"); break;
+ printf ("failure"); break;
default:
- printf ("unknown (%d)", *res->sortStatus);
+ printf ("unknown (%d)", *res->sortStatus);
}
printf ("\n");
print_refid (res->referenceId);
#ifdef ASN_COMPILED
if (res->diagnostics)
display_diagrecs(res->diagnostics,
- res->num_diagnostics);
+ res->num_diagnostics);
#else
if (res->diagnostics)
display_diagrecs(res->diagnostics->diagRecs,
- res->diagnostics->num_diagRecs);
+ res->diagnostics->num_diagRecs);
#endif
}
void process_deleteResultSetResponse (Z_DeleteResultSetResponse *res)
{
printf("Got deleteResultSetResponse status=%d\n",
- *res->deleteOperationStatus);
+ *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);
- }
+ 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);
+ }
}
}
{
if (send_sortrequest(arg, newset) < 0)
return 0;
- return 2;
+ return 2;
}
return 0;
}
}
if (*arg)
{
- if (send_scanrequest(arg, 1, 20) < 0)
+ strcpy (last_scan_query, arg);
+ if (send_scanrequest(arg, 1, 20, 0) < 0)
return 0;
}
else
- if (send_scanrequest(last_scan, 1, 20) < 0)
+ {
+ if (send_scanrequest(last_scan_query, 1, 20, last_scan_line) < 0)
return 0;
+ }
return 2;
}
{
if (!arg || !*arg)
{
- schema = VAL_NONE;
+ schema = VAL_NONE;
return 1;
}
schema = oid_getvalbyname (arg);
if (!arg || !*arg)
{
- elementSetNames = 0;
+ elementSetNames = 0;
return 1;
}
strcpy(what, arg);
if (!arg || !*arg)
{
- printf("Usage: attributeset <setname>\n");
- return 0;
+ printf("Usage: attributeset <setname>\n");
+ return 0;
}
sscanf(arg, "%s", what);
if (p_query_attset (what))
{
- printf("Unknown attribute set name\n");
- return 0;
+ printf("Unknown attribute set name\n");
+ return 0;
}
return 1;
}
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;
refid = NULL;
if (*arg)
{
- refid = (char *) xmalloc (strlen(arg)+1);
- strcpy (refid, arg);
+ refid = (char *) xmalloc (strlen(arg)+1);
+ strcpy (refid, arg);
}
return 1;
}
Z_APDU *apdu;
Z_Close *req;
if (!conn)
- return 0;
+ return 0;
apdu = zget_APDU(out, Z_APDU_close);
req = apdu->u.close;
return 2;
}
+int cmd_packagename(char* arg) {
+ xfree (esPackageName);
+ esPackageName = NULL;
+ if (*arg)
+ {
+ esPackageName = (char *) xmalloc (strlen(arg)+1);
+ strcpy (esPackageName, arg);
+ }
+ return 1;
+};
+
+int cmd_proxy(char* arg) {
+ xfree (yazProxy);
+ yazProxy = NULL;
+ if (*arg)
+ {
+ yazProxy = (char *) xmalloc (strlen(arg)+1);
+ strcpy (yazProxy, arg);
+ }
+ return 1;
+};
+
static void initialize(void)
{
-#if CCL2RPN
+#if YAZ_MODULE_ccl
FILE *inf;
#endif
nmem_init();
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);
{"open", cmd_open, "('tcp'|'osi')':'[<tsel>'/']<host>[':'<port>]"},
{"quit", cmd_quit, ""},
{"find", cmd_find, "<query>"},
- {"delete", cmd_delete, "<setname>"},
+ {"delete", cmd_delete, "<setname>"},
{"base", cmd_base, "<base-name>"},
{"show", cmd_show, "<rec#>['+'<#recs>['+'<setname>]]"},
{"scan", cmd_scan, "<term>"},
- {"sort", cmd_sort, "<sortkey> <flag> <sortkey> <flag> ..."},
- {"sort+", cmd_sort_newset, "<sortkey> <flag> <sortkey> <flag> ..."},
+ {"sort", cmd_sort, "<sortkey> <flag> <sortkey> <flag> ..."},
+ {"sort+", cmd_sort_newset, "<sortkey> <flag> <sortkey> <flag> ..."},
{"authentication", cmd_authentication, "<acctstring>"},
{"lslb", cmd_lslb, "<largeSetLowerBound>"},
{"ssub", cmd_ssub, "<smallSetUpperBound>"},
{"setnames", cmd_setnames, ""},
{"cancel", cmd_cancel, ""},
{"format", cmd_format, "<recordsyntax>"},
- {"schema", cmd_schema, "<schema>"},
+ {"schema", cmd_schema, "<schema>"},
{"elements", cmd_elements, "<elementSetName>"},
{"close", cmd_close, ""},
- {"attributeset", cmd_attributeset, "<attrset>"},
+ {"attributeset", cmd_attributeset, "<attrset>"},
{"querytype", cmd_querytype, "<type>"},
- {"refid", cmd_refid, "<id>"},
- {"itemorder", cmd_itemorder, "1|2 <item>"},
- {"update", cmd_update, "<item>"},
- /* Server Admin Functions */
- {"adm-reindex", cmd_adm_reindex, "<database-name>"},
- {"adm-truncate", cmd_adm_truncate, "('database'|'index')<object-name>"},
- {"adm-create", cmd_adm_create, "<database-name>"},
- {"adm-delete", cmd_adm_delete, "('database'|'index')<object-name>"},
- {"adm-import", cmd_adm_import, "<record-type> <dir> <pattern>"},
- {"adm-refresh", cmd_adm_refresh, "<database-name>"},
- {"adm-commit", cmd_adm_commit, ""},
- {"adm-shutdown", cmd_adm_shutdown, ""},
- {"adm-startup", cmd_adm_startup, ""},
+ {"refid", cmd_refid, "<id>"},
+ {"itemorder", cmd_itemorder, "ill|item <itemno>"},
+ {"update", cmd_update, "<item>"},
+ {"packagename", cmd_packagename, "<packagename>"},
+ {"proxy", cmd_proxy, "('tcp'|'osi')':'[<tsel>'/']<host>[':'<port>]"},
+#ifdef ASN_COMPILED
+ /* Server Admin Functions */
+ {"adm-reindex", cmd_adm_reindex, "<database-name>"},
+ {"adm-truncate", cmd_adm_truncate, "('database'|'index')<object-name>"},
+ {"adm-create", cmd_adm_create, ""},
+ {"adm-drop", cmd_adm_drop, "('database'|'index')<object-name>"},
+ {"adm-import", cmd_adm_import, "<record-type> <dir> <pattern>"},
+ {"adm-refresh", cmd_adm_refresh, ""},
+ {"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;
+#if HAVE_GETTIMEOFDAY
+ struct timeval tv_start, tv_end;
+ gettimeofday (&tv_start, 0);
+#endif
while (1)
{
#ifdef USE_SELECT
fd_set input;
#endif
- char line[1024], word[1024], arg[1024];
-
+ char line[1024], word[32], arg[1024];
+
#ifdef USE_SELECT
FD_ZERO(&input);
FD_SET(0, &input);
continue;
if (!wait && FD_ISSET(0, &input))
#else
- if (!wait)
+ if (!wait)
#endif
- {
+ {
#if HAVE_READLINE_READLINE_H
- char* line_in;
- line_in=readline(C_PROMPT);
+ char* line_in;
+ line_in=readline(C_PROMPT);
if (!line_in)
break;
#if HAVE_READLINE_HISTORY_H
if (*line_in)
- add_history(line_in);
+ add_history(line_in);
#endif
- strcpy(line,line_in);
+ strcpy(line,line_in);
free (line_in);
#else
- char *end_p;
+ char *end_p;
printf (C_PROMPT);
- fflush(stdout);
- if (!fgets(line, 1023, stdin))
- break;
- if ((end_p = strchr (line, '\n')))
- *end_p = '\0';
+ fflush(stdout);
+ if (!fgets(line, 1023, stdin))
+ break;
+ if ((end_p = strchr (line, '\n')))
+ *end_p = '\0';
#endif
- if ((res = sscanf(line, "%s %[^;]", word, arg)) <= 0)
+#if HAVE_GETTIMEOFDAY
+ gettimeofday (&tv_start, 0);
+#endif
+
+ if ((res = sscanf(line, "%31s %1023[^;]", word, arg)) <= 0)
{
strcpy(word, last_cmd);
*arg = '\0';
res = 1;
}
if (res < 2)
- {
- continue;
- }
+ {
+ continue;
+ }
}
- wait = 0;
- if (conn
+ wait = 0;
+ if (conn
#ifdef USE_SELECT
- && FD_ISSET(cs_fileno(conn), &input)
+ && FD_ISSET(cs_fileno(conn), &input)
#endif
- )
+ )
{
do
{
exit(1);
}
odr_reset(in); /* release APDU from last round */
- record_last = 0;
+ 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, "[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);
+ if (apdu_file)
+ z_APDU(print, &apdu, 0, 0);
exit(1);
}
if (apdu_file && !z_APDU(print, &apdu, 0, 0))
}
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:
+ 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");
+ 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;
+ *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);
+ 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
}
}
return 0;
int ret;
int opened = 0;
- while ((ret = options("a:m:v:", argv, argc, &arg)) != -2)
+ while ((ret = options("c:a:m:v:p:", argv, argc, &arg)) != -2)
{
switch (ret)
{
case 0:
if (!opened)
- {
- initialize ();
- if (cmd_open (arg) == 2)
- opened = 1;
- }
+ {
+ initialize ();
+ if (cmd_open (arg) == 2) {
+#if HAVE_READLINE_HISTORY_H
+ char* tmp=(char*)malloc(strlen(arg)+6);
+ *tmp=0;
+ strcat(tmp,"open ");
+ strcat(tmp,arg);
+ add_history(tmp);
+ free(tmp);
+#endif
+ opened = 1;
+ };
+ }
break;
case 'm':
if (!(marcdump = fopen (arg, "a")))
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 'v':
- log_init (log_mask_str(arg), "", NULL);
+ case 'p':
+ yazProxy=strdup(arg);
break;
+ case 'v':
+ yaz_log_init (yaz_log_mask_str(arg), "", NULL);
+ break;
default:
- fprintf (stderr, "Usage: %s [-m <marclog>] [ -m <apdulog>] "
- "[<server-addr>]\n",
+ fprintf (stderr, "Usage: %s [-m <marclog>] [ -a <apdulog>] "
+ "[-c cclfields] [-p <proxy-addr>] [<server-addr>]\n",
prog);
exit (1);
}
}
if (!opened)
- initialize ();
+ initialize ();
return client (opened);
}
-
-
projects / yaz-moved-to-github.git / blobdiff