* Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
*
- * $Id: client.c,v 1.204 2003-07-18 22:41:25 mike Exp $
+ * $Id: client.c,v 1.219 2003-12-31 00:14:00 adam Exp $
*/
#include <stdio.h>
static char *codeset = 0; /* character set for output */
static int hex_dump = 0;
+static char *dump_file_prefix = 0;
static ODR out, in, print; /* encoding and decoding streams */
#if HAVE_XML2
static ODR srw_sr_odr_out = 0;
static char *last_open_command = NULL;
static int auto_reconnect = 0;
+static char cur_host[200];
+
typedef enum {
QueryType_Prefix,
QueryType_CCL,
static QueryType queryType = QueryType_Prefix;
static CCL_bibset bibset; /* CCL bibset handle */
-static cql_transform_t cqltrans; /* CQL qualifier-set handle */
+static cql_transform_t cqltrans; /* CQL context-set handle */
#if HAVE_READLINE_COMPLETION_OVER
printf("\n");
}
}
+ if (dump_file_prefix)
+ {
+ static int no = 0;
+ if (++no < 1000 && strlen(dump_file_prefix) < 500)
+ {
+ char fname[1024];
+ FILE *of;
+ sprintf (fname, "%s.%03d.raw", dump_file_prefix, no);
+ of = fopen(fname, "wb");
+
+ fwrite (buf, 1, len, of);
+
+ fclose(of);
+ }
+ }
}
void add_otherInfos(Z_APDU *a)
if (ber_file)
odr_dumpBER(ber_file, buf, len);
/* printf ("sending APDU of size %d\n", len); */
+ do_hex_dump(buf, len);
if (cs_put(conn, buf, len) < 0)
{
fprintf(stderr, "cs_put: %s", cs_errmsg(cs_errno(conn)));
close_session();
return 0;
}
- do_hex_dump(buf,len);
odr_reset(out); /* release the APDU structure */
return 1;
}
printf("Sent initrequest.\n");
}
+
+/* These two are used only from process_initResponse() */
+static void render_initUserInfo(Z_OtherInformation *ui1);
+static void render_diag(Z_DiagnosticFormat *diag);
+
static int process_initResponse(Z_InitResponse *res)
{
int ver = 0;
if (res->userInformationField)
{
Z_External *uif = res->userInformationField;
- printf("UserInformationfield:\n");
- if (!z_External(print, (Z_External**)&uif, 0, 0))
- {
- odr_perror(print, "Printing userinfo\n");
- odr_reset(print);
- }
- if (uif->which == Z_External_octet)
- {
- printf("Guessing visiblestring:\n");
- printf("'%s'\n", uif->u. octet_aligned->buf);
- } else if (uif->which == Z_External_single) {
- /* Peek at any private Init-diagnostic APDUs */
- Odr_any *sat = uif->u.single_ASN1_type;
- printf("### NAUGHTY: External is '%s'\n", sat->buf);
+ if (uif->which == Z_External_userInfo1) {
+ render_initUserInfo(uif->u.userInfo1);
+ } else {
+ printf("UserInformationfield:\n");
+ if (!z_External(print, (Z_External**)&uif, 0, 0)) {
+ odr_perror(print, "Printing userinfo\n");
+ odr_reset(print);
+ }
+ if (uif->which == Z_External_octet) {
+ printf("Guessing visiblestring:\n");
+ printf("'%s'\n", uif->u. octet_aligned->buf);
+ } else if (uif->which == Z_External_single) {
+ /* Peek at any private Init-diagnostic APDUs */
+ Odr_any *sat = uif->u.single_ASN1_type;
+ printf("### NAUGHTY: External is '%s'\n", sat->buf);
+ }
+ odr_reset (print);
}
- odr_reset (print);
}
printf ("Options:");
if (ODR_MASK_GET(res->options, Z_Options_search))
yaz_get_response_charneg(session_mem, p, &charset, &lang,
&selected);
+
+ if (outputCharset && negotiationCharset) {
+ odr_set_charset (out, charset, outputCharset);
+ odr_set_charset (in, outputCharset, charset);
+ }
+ else {
+ odr_set_charset (out, 0, 0);
+ odr_set_charset (in, 0, 0);
+ }
printf("Accepted character set : %s\n", charset);
printf("Accepted code language : %s\n", lang ? lang : "none");
return 0;
}
+
+static void render_initUserInfo(Z_OtherInformation *ui1) {
+ int i;
+ printf("Init response contains %d otherInfo unit%s:\n",
+ ui1->num_elements, ui1->num_elements == 1 ? "" : "s");
+
+ for (i = 0; i < ui1->num_elements; i++) {
+ Z_OtherInformationUnit *unit = ui1->list[i];
+ printf(" %d: otherInfo unit contains ", i+1);
+ if (unit->which == Z_OtherInfo_externallyDefinedInfo &&
+ unit->information.externallyDefinedInfo->which ==
+ Z_External_diag1) {
+ render_diag(unit->information.externallyDefinedInfo->u.diag1);
+ } else {
+ printf("unsupported otherInfo unit type %d\n", unit->which);
+ }
+ }
+}
+
+
+/* ### should this share code with display_diagrecs()? */
+static void render_diag(Z_DiagnosticFormat *diag) {
+ int i;
+
+ printf("%d diagnostic%s:\n", diag->num, diag->num == 1 ? "" : "s");
+ for (i = 0; i < diag->num; i++) {
+ Z_DiagnosticFormat_s *ds = diag->elements[i];
+ printf(" %d: ", i+1);
+ switch (ds->which) {
+ case Z_DiagnosticFormat_s_defaultDiagRec: {
+ Z_DefaultDiagFormat *dd = ds->u.defaultDiagRec;
+ /* ### should check `dd->diagnosticSetId' */
+ printf("code=%d (%s)", *dd->condition,
+ diagbib1_str(*dd->condition));
+ /* Both types of addinfo are the same, so use type-pun */
+ if (dd->u.v2Addinfo != 0)
+ printf(",\n\taddinfo='%s'", dd->u.v2Addinfo);
+ break;
+ }
+ case Z_DiagnosticFormat_s_explicitDiagnostic:
+ printf("Explicit diagnostic (not supported)");
+ break;
+ default:
+ printf("Unrecognised diagnostic type %d", ds->which);
+ break;
+ }
+
+ if (ds->message != 0)
+ printf(", message='%s'", ds->message);
+ printf("\n");
+ }
+}
+
+
static int set_base(const char *arg)
{
int i;
int cmd_open(const char *arg)
{
- static char cur_host[200];
if (arg)
{
strncpy (cur_host, arg, sizeof(cur_host)-1);
if (r == 1)
{
auth = &au;
- au.which = Z_IdAuthentication_open;
- au.u.open = user;
- printf("Authentication set to Open (%s)\n", user);
+ if (!strcmp(user, "-")) {
+ au.which = Z_IdAuthentication_anonymous;
+ printf("Authentication set to Anonymous\n");
+ } else {
+ au.which = Z_IdAuthentication_open;
+ au.u.open = user;
+ printf("Authentication set to Open (%s)\n", user);
+ }
}
if (r == 2)
{
static int send_srw(Z_SRW_PDU *sr)
{
const char *charset = negotiationCharset;
- const char *host_port = 0;
+ const char *host_port = cur_host;
char *path = 0;
char ctype[50];
Z_SOAP_Handler h[2] = {
- {"http://www.loc.gov/zing/srw/v1.0/", 0, (Z_SOAP_fun) yaz_srw_codec},
+ {"http://www.loc.gov/zing/srw/", 0, (Z_SOAP_fun) yaz_srw_codec},
{0, 0, 0}
};
ODR o = odr_createmem(ODR_ENCODE);
memcpy (h, cp0, cp1 - cp0);
h[cp1-cp0] = '\0';
z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers,
- "host", h);
+ "Host", h);
}
}
char *buf_out;
int len_out;
int r;
+ if (apdu_file)
+ {
+ if (!z_GDU(print, &gdu, 0, 0))
+ printf ("Failed to print outgoing APDU\n");
+ odr_reset(print);
+ }
buf_out = odr_getbuf(out, &len_out, 0);
/* we don't odr_reset(out), since we may need the buffer again */
+ do_hex_dump(buf_out, len_out);
+
r = cs_put(conn, buf_out, len_out);
odr_destroy(o);
return 0;
}
+static int cmd_update_common(const char *arg, int version);
+
static int cmd_update(const char *arg)
{
+ return cmd_update_common(arg, 1);
+}
+
+static int cmd_update0(const char *arg)
+{
+ return cmd_update_common(arg, 0);
+}
+
+static int cmd_update_common(const char *arg, int version)
+{
Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest );
Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
Z_External *r;
int oid[OID_SIZE];
- Z_IUOriginPartToKeep *toKeep;
- Z_IUSuppliedRecords *notToKeep;
oident update_oid;
char action[20], recid[20], fname[80];
int action_no;
update_oid.proto = PROTO_Z3950;
update_oid.oclass = CLASS_EXTSERV;
- update_oid.value = VAL_DBUPDATE;
+ if (version == 0)
+ update_oid.value = VAL_DBUPDATE0;
+ else
+ update_oid.value = VAL_DBUPDATE;
oid_ent_to_oid (&update_oid, oid);
req->packageType = odr_oiddup(out,oid);
req->packageName = esPackageName;
r->direct_reference = odr_oiddup(out,oid);
r->indirect_reference = 0;
r->descriptor = 0;
- r->which = Z_External_update;
- r->u.update = (Z_IUUpdate *) odr_malloc(out, sizeof(*r->u.update));
- r->u.update->which = Z_IUUpdate_esRequest;
- r->u.update->u.esRequest = (Z_IUUpdateEsRequest *)
- odr_malloc(out, sizeof(*r->u.update->u.esRequest));
- toKeep = r->u.update->u.esRequest->toKeep = (Z_IUOriginPartToKeep *)
- odr_malloc(out, sizeof(*r->u.update->u.esRequest->toKeep));
- toKeep->databaseName = databaseNames[0];
- toKeep->schema = 0;
- toKeep->elementSetName = 0;
- toKeep->actionQualifier = 0;
- toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));
- *toKeep->action = action_no;
-
- notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *)
- odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep));
- notToKeep->num = 1;
- notToKeep->elements = (Z_IUSuppliedRecords_elem **)
- odr_malloc(out, sizeof(*notToKeep->elements));
- notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *)
- odr_malloc(out, sizeof(**notToKeep->elements));
- notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque;
- if (*recid)
- {
- notToKeep->elements[0]->u.opaque = (Odr_oct *)
- odr_malloc (out, sizeof(Odr_oct));
- notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid;
- notToKeep->elements[0]->u.opaque->size = strlen(recid);
- notToKeep->elements[0]->u.opaque->len = strlen(recid);
+ if (version == 0)
+ {
+ Z_IU0OriginPartToKeep *toKeep;
+ Z_IU0SuppliedRecords *notToKeep;
+
+ r->which = Z_External_update0;
+ r->u.update0 = (Z_IU0Update *) odr_malloc(out, sizeof(*r->u.update0));
+ r->u.update0->which = Z_IUUpdate_esRequest;
+ r->u.update0->u.esRequest = (Z_IU0UpdateEsRequest *)
+ odr_malloc(out, sizeof(*r->u.update0->u.esRequest));
+ toKeep = r->u.update0->u.esRequest->toKeep = (Z_IU0OriginPartToKeep *)
+ odr_malloc(out, sizeof(*r->u.update0->u.esRequest->toKeep));
+
+ toKeep->databaseName = databaseNames[0];
+ toKeep->schema = 0;
+ toKeep->elementSetName = 0;
+
+ toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));
+ *toKeep->action = action_no;
+
+ notToKeep = r->u.update0->u.esRequest->notToKeep = (Z_IU0SuppliedRecords *)
+ odr_malloc(out, sizeof(*r->u.update0->u.esRequest->notToKeep));
+ notToKeep->num = 1;
+ notToKeep->elements = (Z_IU0SuppliedRecords_elem **)
+ odr_malloc(out, sizeof(*notToKeep->elements));
+ notToKeep->elements[0] = (Z_IU0SuppliedRecords_elem *)
+ odr_malloc(out, sizeof(**notToKeep->elements));
+ notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque;
+ if (*recid)
+ {
+ notToKeep->elements[0]->u.opaque = (Odr_oct *)
+ odr_malloc (out, sizeof(Odr_oct));
+ notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid;
+ notToKeep->elements[0]->u.opaque->size = strlen(recid);
+ notToKeep->elements[0]->u.opaque->len = strlen(recid);
+ }
+ else
+ notToKeep->elements[0]->u.opaque = 0;
+ notToKeep->elements[0]->supplementalId = 0;
+ notToKeep->elements[0]->correlationInfo = 0;
+ notToKeep->elements[0]->record = record_this;
}
else
- notToKeep->elements[0]->u.opaque = 0;
- notToKeep->elements[0]->supplementalId = 0;
- notToKeep->elements[0]->correlationInfo = 0;
- notToKeep->elements[0]->record = record_this;
+ {
+ Z_IUOriginPartToKeep *toKeep;
+ Z_IUSuppliedRecords *notToKeep;
+
+ r->which = Z_External_update;
+ r->u.update = (Z_IUUpdate *) odr_malloc(out, sizeof(*r->u.update));
+ r->u.update->which = Z_IUUpdate_esRequest;
+ r->u.update->u.esRequest = (Z_IUUpdateEsRequest *)
+ odr_malloc(out, sizeof(*r->u.update->u.esRequest));
+ toKeep = r->u.update->u.esRequest->toKeep = (Z_IUOriginPartToKeep *)
+ odr_malloc(out, sizeof(*r->u.update->u.esRequest->toKeep));
+
+ toKeep->databaseName = databaseNames[0];
+ toKeep->schema = 0;
+ toKeep->elementSetName = 0;
+ toKeep->actionQualifier = 0;
+ toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));
+ *toKeep->action = action_no;
+
+ notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *)
+ odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep));
+ notToKeep->num = 1;
+ notToKeep->elements = (Z_IUSuppliedRecords_elem **)
+ odr_malloc(out, sizeof(*notToKeep->elements));
+ notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *)
+ odr_malloc(out, sizeof(**notToKeep->elements));
+ notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque;
+ if (*recid)
+ {
+ notToKeep->elements[0]->u.opaque = (Odr_oct *)
+ odr_malloc (out, sizeof(Odr_oct));
+ notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid;
+ notToKeep->elements[0]->u.opaque->size = strlen(recid);
+ notToKeep->elements[0]->u.opaque->len = strlen(recid);
+ }
+ else
+ notToKeep->elements[0]->u.opaque = 0;
+ notToKeep->elements[0]->supplementalId = 0;
+ notToKeep->elements[0]->correlationInfo = 0;
+ notToKeep->elements[0]->record = record_this;
+ }
send_apdu(apdu);
return 2;
}
+static int cmd_explain(const char *arg)
+{
+ if (protocol != PROTO_HTTP)
+ return 0;
+#if HAVE_XML2
+ if (!conn)
+ cmd_open(0);
+ if (conn)
+ {
+ Z_SRW_PDU *sr = 0;
+
+ setno = 1;
+
+ /* save this for later .. when fetching individual records */
+ sr = yaz_srw_get(out, Z_SRW_explain_request);
+ send_srw(sr);
+ return 2;
+ }
+#endif
+ return 0;
+}
+
static int cmd_find(const char *arg)
{
if (!*arg)
#if HAVE_XML2
if (!conn)
cmd_open(0);
+ if (!conn)
+ return 0;
if (!send_SRW_searchRequest(arg))
return 0;
#else
#if HAVE_XML2
if (!conn)
cmd_open(0);
+ if (!conn)
+ return 0;
if (!send_SRW_presentRequest(arg))
return 0;
#else
void display_term(Z_TermInfo *t)
{
- if (t->term->which == Z_Term_general)
+ if (t->displayTerm)
+ printf("%s", t->displayTerm);
+ else if (t->term->which == Z_Term_general)
{
printf("%.*s", t->term->u.general->len, t->term->u.general->buf);
sprintf(last_scan_line, "%.*s", t->term->u.general->len,
else
printf ("Output charset conversion disabled\n");
}
- if (outputCharset && negotiationCharset)
- {
- odr_set_charset (out, negotiationCharset, outputCharset);
- odr_set_charset (in, outputCharset, negotiationCharset);
- }
- else
- {
- odr_set_charset (out, 0, 0);
- odr_set_charset (in, 0, 0);
- }
+
return 1;
}
#endif
#if HAVE_XML2
+static void handle_srw_record(Z_SRW_record *rec)
+{
+ if (rec->recordPosition)
+ {
+ printf ("pos=%d", *rec->recordPosition);
+ setno = *rec->recordPosition + 1;
+ }
+ if (rec->recordSchema)
+ printf (" schema=%s", rec->recordSchema);
+ printf ("\n");
+ if (rec->recordData_buf && rec->recordData_len)
+ {
+ fwrite(rec->recordData_buf, 1, rec->recordData_len, stdout);
+ printf ("\n");
+ }
+}
+
+static void handle_srw_explain_response(Z_SRW_explainResponse *res)
+{
+ handle_srw_record(&res->record);
+}
+
static void handle_srw_response(Z_SRW_searchRetrieveResponse *res)
{
int i;
if (res->numberOfRecords)
printf ("Number of hits: %d\n", *res->numberOfRecords);
for (i = 0; i<res->num_records; i++)
- {
- Z_SRW_record *rec = res->records + i;
-
- if (rec->recordPosition)
- {
- printf ("pos=%d", *rec->recordPosition);
- setno = *rec->recordPosition + 1;
- }
- if (rec->recordSchema)
- printf (" schema=%s", rec->recordSchema);
- printf ("\n");
- if (rec->recordData_buf && rec->recordData_len)
- {
- fwrite(rec->recordData_buf, 1, rec->recordData_len, stdout);
- printf ("\n");
- }
- }
+ handle_srw_record(res->records + i);
}
static void http_response(Z_HTTP_Response *hres)
Z_SOAP *soap_package = 0;
ODR o = odr_createmem(ODR_DECODE);
Z_SOAP_Handler soap_handlers[2] = {
- {"http://www.loc.gov/zing/srw/v1.0/", 0,
+ {"http://www.loc.gov/zing/srw/", 0,
(Z_SOAP_fun) yaz_srw_codec},
{0, 0, 0}
};
Z_SRW_PDU *sr = soap_package->u.generic->p;
if (sr->which == Z_SRW_searchRetrieve_response)
handle_srw_response(sr->u.response);
+ else if (sr->which == Z_SRW_explain_response)
+ handle_srw_explain_response(sr->u.explain_response);
else
ret = -1;
}
- else if (!ret && (soap_package->which == Z_SOAP_fault
+ else if (soap_package && (soap_package->which == Z_SOAP_fault
|| soap_package->which == Z_SOAP_error))
{
printf ("HTTP Error Status=%d\n", hres->code);
soap_package->u.fault->fault_code);
printf ("SOAP Fault string %s\n",
soap_package->u.fault->fault_string);
+ if (soap_package->u.fault->details)
+ printf ("SOAP Details %s\n",
+ soap_package->u.fault->details);
}
else
ret = -1;
}
close_session();
}
- if (!strcmp(hres->version, "1.0"))
- {
- /* HTTP 1.0: only if Keep-Alive we stay alive.. */
- if (!connection_head || strcmp(connection_head, "Keep-Alive"))
- close_session();
- }
- else
+ else
{
- /* HTTP 1.1: only if no close we stay alive .. */
- if (connection_head && !strcmp(connection_head, "close"))
- close_session();
+ if (!strcmp(hres->version, "1.0"))
+ {
+ /* HTTP 1.0: only if Keep-Alive we stay alive.. */
+ if (!connection_head || strcmp(connection_head, "Keep-Alive"))
+ close_session();
+ }
+ else
+ {
+ /* HTTP 1.1: only if no close we stay alive .. */
+ if (connection_head && !strcmp(connection_head, "close"))
+ close_session();
+ }
}
}
#endif
buf_out = odr_getbuf(out, &len_out, 0);
+ do_hex_dump(buf_out, len_out);
+
cs_put(conn, buf_out, len_out);
odr_reset(out);
odr_dumpBER(f, netbuffer, res);
fprintf(f, "---------\n");
if (apdu_file)
+ {
z_GDU(print, &gdu, 0, 0);
+ odr_reset(print);
+ }
if (conn && cs_more(conn))
continue;
break;
printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported);
}
-
oidval = oid_getvalbyname (oid);
if(oidval == -1 ) {
printf("Error in set_otherinfo command unknown oid %s \n",oid);
{"refid", cmd_refid, "<id>",NULL,0,NULL},
{"itemorder", cmd_itemorder, "ill|item <itemno>",NULL,0,NULL},
{"update", cmd_update, "<action> <recid> [<file>]",NULL,0,NULL},
+ {"update0", cmd_update0, "<action> <recid> [<file>]",NULL,0,NULL},
{"packagename", cmd_packagename, "<packagename>",NULL,0,NULL},
{"proxy", cmd_proxy, "[('tcp'|'ssl')]<host>[':'<port>]",NULL,0,NULL},
{"charset", cmd_charset, "<nego_charset> <output_charset>",NULL,0,NULL},
{"adm-commit", cmd_adm_commit, "",NULL,0,NULL},
{"adm-shutdown", cmd_adm_shutdown, "",NULL,0,NULL},
{"adm-startup", cmd_adm_startup, "",NULL,0,NULL},
+ {"explain", cmd_explain, "", NULL, 0, NULL},
{"help", cmd_help, "", NULL,0,NULL},
{0,0,0,0,0,0}
};
if (codeset)
outputCharset = xstrdup(codeset);
- while ((ret = options("k:c:q:a:b:m:v:p:u:t:Vx", argv, argc, &arg)) != -2)
+ while ((ret = options("k:c:q:a:b:m:v:p:u:t:Vxd:", argv, argc, &arg)) != -2)
{
switch (ret)
{
strcat (open_command, arg);
}
break;
+ case 'd':
+ dump_file_prefix = arg;
+ break;
case 'k':
kilobytes = atoi(arg);
break;
fprintf (stderr, "Usage: %s [-m <marclog>] [ -a <apdulog>] "
"[-b berdump] [-c cclfields] \n"
"[-q cqlfields] [-p <proxy-addr>] [-u <auth>] "
- "[-k size] [-V] [<server-addr>]\n",
+ "[-k size] [-d dump] [-V] [<server-addr>]\n",
prog);
exit (1);
}