/*
- * Copyright (c) 1995-2003, Index Data
+ * Copyright (c) 1995-2004, Index Data
* See the file LICENSE for details.
*
- * $Id: client.c,v 1.210 2003-10-21 12:35:50 mike Exp $
+ * $Id: client.c,v 1.239 2004-04-28 12:10:51 adam Exp $
*/
#include <stdio.h>
#include <langinfo.h>
#endif
+#if HAVE_OPENSSL_SSL_H
+#include <openssl/crypto.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#endif
+
#include <time.h>
#include <ctype.h>
static int setno = 1; /* current set offset */
static enum oid_proto protocol = PROTO_Z3950; /* current app protocol */
static enum oid_value recordsyntax = VAL_USMARC;
-static char *schema = 0;
+static char *record_schema = 0;
static int sent_close = 0;
static NMEM session_mem = NULL; /* memory handle for init-response */
static Z_InitResponse *session = 0; /* session parameters */
static char *outputCharset = 0;
static char *marcCharset = 0;
static char* yazLang = 0;
+static char* http_version = "1.1";
static char last_cmd[32] = "?";
static FILE *marc_file = 0;
static char *refid = NULL;
static char *last_open_command = NULL;
static int auto_reconnect = 0;
+static Odr_bitmask z3950_options;
+static int z3950_version = 3;
+
+static char cur_host[200];
typedef enum {
QueryType_Prefix,
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
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_initRequest);
Z_InitRequest *req = apdu->u.initRequest;
+ int i;
- ODR_MASK_SET(req->options, Z_Options_search);
- ODR_MASK_SET(req->options, Z_Options_present);
- ODR_MASK_SET(req->options, Z_Options_namedResultSets);
- ODR_MASK_SET(req->options, Z_Options_triggerResourceCtrl);
- ODR_MASK_SET(req->options, Z_Options_scan);
- ODR_MASK_SET(req->options, Z_Options_sort);
- ODR_MASK_SET(req->options, Z_Options_extendedServices);
- ODR_MASK_SET(req->options, Z_Options_delSet);
+ req->options = &z3950_options;
- ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1);
- ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2);
- ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3);
+ ODR_MASK_ZERO(req->protocolVersion);
+ for (i = 0; i<z3950_version; i++)
+ ODR_MASK_SET(req->protocolVersion, i);
*req->maximumRecordSize = 1024*kilobytes;
*req->preferredMessageSize = 1024*kilobytes;
req->referenceId = set_refid (out);
- if (yazProxy)
+ if (yazProxy && type_and_host)
yaz_oi_set_string_oidval(&req->otherInfo, out, VAL_PROXY,
1, type_and_host);
yaz_oi_APDU(apdu, &p);
if ((p0=yaz_oi_update(p, out, NULL, 0, 0))) {
- ODR_MASK_SET(req->options, Z_Options_negotiationModel);
-
- p0->which = Z_OtherInfo_externallyDefinedInfo;
- p0->information.externallyDefinedInfo =
- yaz_set_proposal_charneg(
- out,
- (const char**)&negotiationCharset,
- negotiationCharset ? 1 : 0,
- (const char**)&yazLang, yazLang ? 1 : 0, 1);
+ ODR_MASK_SET(req->options, Z_Options_negotiationModel);
+
+ p0->which = Z_OtherInfo_externallyDefinedInfo;
+ p0->information.externallyDefinedInfo =
+ yaz_set_proposal_charneg(
+ out,
+ (const char**)&negotiationCharset,
+ negotiationCharset ? 1 : 0,
+ (const char**)&yazLang, yazLang ? 1 : 0, 1);
}
}
static void render_initUserInfo(Z_OtherInformation *ui1);
static void render_diag(Z_DiagnosticFormat *diag);
+static void pr_opt(const char *opt, void *clientData)
+{
+ printf (" %s", opt);
+}
+
static int process_initResponse(Z_InitResponse *res)
{
int ver = 0;
session_mem = odr_extract_mem(in);
session = res;
- for (ver = 0; ver<5; ver++)
+ for (ver = 0; ver < 8; ver++)
if (!ODR_MASK_GET(res->protocolVersion, ver))
break;
}
}
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");
+ yaz_init_opt_decode(res->options, pr_opt, 0);
+ printf ("\n");
+
if (ODR_MASK_GET(res->options, Z_Options_namedResultSets))
- {
- printf (" namedResultSets");
setnumber = 0;
- }
- if (ODR_MASK_GET(res->options, Z_Options_encapsulation))
- printf (" encapsulation");
- if (ODR_MASK_GET(res->options, Z_Options_resultCount))
- printf (" resultCount");
- if (ODR_MASK_GET(res->options, Z_Options_negotiationModel))
- printf (" negotiationModel");
- if (ODR_MASK_GET(res->options, Z_Options_duplicateDetection))
- printf (" duplicateDetection");
- if (ODR_MASK_GET(res->options, Z_Options_queryType104))
- printf (" queryType104");
- printf ("\n");
if (ODR_MASK_GET(res->options, Z_Options_negotiationModel)) {
case Z_DiagnosticFormat_s_defaultDiagRec: {
Z_DefaultDiagFormat *dd = ds->u.defaultDiagRec;
/* ### should check `dd->diagnosticSetId' */
- printf("code=%d", *dd->condition);
+ 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(", addinfo='%s'", dd->u.v2Addinfo);
+ printf(",\n\taddinfo='%s'", dd->u.v2Addinfo);
break;
}
case Z_DiagnosticFormat_s_explicitDiagnostic:
void *add;
char type_and_host[101];
const char *basep = 0;
+#if HAVE_OPENSSL_SSL_H
+ SSL *ssl;
+#endif
if (conn)
{
cs_close (conn);
return 0;
}
printf("OK.\n");
+#if HAVE_OPENSSL_SSL_H
+ if ((ssl = (SSL *) cs_get_ssl(conn)))
+ {
+ X509 *server_cert = SSL_get_peer_certificate (ssl);
+ char *str;
+ if (server_cert)
+ {
+ printf ("Server certificate:\n");
+
+ str = X509_NAME_oneline (X509_get_subject_name (server_cert),0,0);
+ if (str)
+ {
+ printf ("\t subject: %s\n", str);
+ free (str);
+ }
+ str = X509_NAME_oneline (X509_get_issuer_name (server_cert),0,0);
+ if (str)
+ {
+ printf ("\t issuer: %s\n", str);
+ free (str);
+ }
+ X509_free (server_cert);
+ }
+ }
+#endif
if (basep && *basep)
set_base (basep);
if (protocol == PROTO_Z3950)
int cmd_open(const char *arg)
{
- static char cur_host[200];
if (arg)
{
strncpy (cur_host, arg, sizeof(cur_host)-1);
if (ent && r->which == Z_External_octet)
{
Z_ext_typeent *type = z_ext_getentbyref(ent->value);
- void *rr;
+ char *rr;
if (type)
{
*/
odr_setbuf(in, (char*)r->u.octet_aligned->buf,
r->u.octet_aligned->len, 0);
- if (!(*type->fun)(in, (char **)&rr, 0, 0))
+ if (!(*type->fun)(in, &rr, 0, 0))
{
odr_perror(in, "Decoding constructed record.");
fprintf(stdout, "[Near %d]\n", odr_offset(in));
}
}
}
- if (ent && ent->oclass != CLASS_RECSYN)
- return;
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)
{
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)
+ if (ent->oclass == CLASS_RECSYN &&
+ (ent->value == VAL_TEXT_XML ||
+ ent->value == VAL_APPLICATION_XML ||
+ ent->value == VAL_HTML))
{
print_record((const unsigned char *) octet_buf,
r->u.octet_aligned->len);
printf ("shelvingLocation: %s\n", data->shelvingLocation);
if (data->callNumber)
printf ("callNumber: %s\n", data->callNumber);
+ if (data->shelvingData)
+ printf ("shelvingData: %s\n", data->shelvingData);
if (data->copyNumber)
printf ("copyNumber: %s\n", data->copyNumber);
if (data->publicNote)
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);
strcpy(path+1, databaseNames[0]);
gdu = z_get_HTTP_Request(out);
+ gdu->u.HTTP_Request->version = http_version;
gdu->u.HTTP_Request->path = odr_strdup(out, path);
if (host_port)
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 */
sr = yaz_srw_get(out, Z_SRW_searchRetrieve_request);
sr->u.request->query_type = Z_SRW_query_type_cql;
sr->u.request->query.cql = odr_strdup(out, arg);
- if (schema)
- sr->u.request->recordSchema = schema;
+
+ sr->u.request->maximumRecords = odr_intdup(out, 0);
+
+ if (record_schema)
+ sr->u.request->recordSchema = record_schema;
+ if (recordsyntax == VAL_TEXT_XML)
+ sr->u.explain_request->recordPacking = "xml";
return send_srw(sr);
}
#endif
return 2;
}
+static void show_opt(const char *arg, void *clientData)
+{
+ printf ("%s ", arg);
+}
+
+static int cmd_zversion(const char *arg)
+{
+ if (*arg && arg)
+ z3950_version = atoi(arg);
+ else
+ printf ("version is %d\n", z3950_version);
+ return 0;
+}
+
+static int cmd_options(const char *arg)
+{
+ if (*arg)
+ {
+ int r;
+ int pos;
+ r = yaz_init_opt_encode(&z3950_options, arg, &pos);
+ }
+ else
+ {
+ yaz_init_opt_decode(&z3950_options, show_opt, 0);
+ printf ("\n");
+ }
+ return 0;
+}
+
+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);
+ if (recordsyntax == VAL_TEXT_XML)
+ sr->u.explain_request->recordPacking = "xml";
+ send_srw(sr);
+ return 2;
+ }
+#endif
+ return 0;
+}
+
+static int cmd_init(const char *arg)
+{
+ if (!conn || protocol != PROTO_Z3950)
+ return 0;
+ send_initRequest(0);
+ return 2;
+}
+
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
req->preferredRecordSyntax =
odr_oiddup (out, oid_ent_to_oid(&prefsyn, oid));
- if (schema)
+ if (record_schema)
{
oident prefschema;
prefschema.proto = protocol;
prefschema.oclass = CLASS_SCHEMA;
- prefschema.value = oid_getvalbyname(schema);
+ prefschema.value = oid_getvalbyname(record_schema);
req->recordComposition = &compo;
compo.which = Z_RecordComp_complex;
parse_show_args(arg, setstring, &setno, &nos);
sr->u.request->startRecord = odr_intdup(out, setno);
sr->u.request->maximumRecords = odr_intdup(out, nos);
- if (schema)
- sr->u.request->recordSchema = schema;
+ if (record_schema)
+ sr->u.request->recordSchema = record_schema;
+ if (recordsyntax == VAL_TEXT_XML)
+ sr->u.request->recordPacking = "xml";
return send_srw(sr);
}
#endif
#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,
int cmd_schema(const char *arg)
{
- xfree(schema);
- schema = 0;
+ xfree(record_schema);
+ record_schema = 0;
if (arg && *arg)
- schema = xstrdup(arg);
+ record_schema = xstrdup(arg);
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);
+ else
+ printf ("No data!");
+ printf("\n");
+}
+
+static void handle_srw_explain_response(Z_SRW_explainResponse *res)
+{
+ handle_srw_record(&res->record);
+}
+
static void handle_srw_response(Z_SRW_searchRetrieveResponse *res)
{
int i;
for (i = 0; i<res->num_diagnostics; i++)
{
- printf ("SRW diagnostic %d %s\n",
- *res->diagnostics[i].code,
- yaz_diag_srw_str(*res->diagnostics[i].code));
-
+ if (res->diagnostics[i].uri)
+ printf ("SRW diagnostic %s\n",
+ res->diagnostics[i].uri);
+ else
+ printf ("SRW diagnostic missing or could not be decoded\n");
+ if (res->diagnostics[i].message)
+ printf ("Message: %s\n", res->diagnostics[i].message);
if (res->diagnostics[i].details)
printf ("Details: %s\n", res->diagnostics[i].details);
}
if (res->numberOfRecords)
printf ("Number of hits: %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
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);
/* print present related options */
printf("Format : %s\n",yaz_z3950_oid_value_to_str(recordsyntax,CLASS_RECSYN));
- printf("Schema : %s\n",schema);
+ printf("Schema : %s\n",record_schema ? record_schema : "not set");
printf("Elements : %s\n",elementSetNames?elementSetNames->u.generic:"");
/* loging options */
{"adm-commit", cmd_adm_commit, "",NULL,0,NULL},
{"adm-shutdown", cmd_adm_shutdown, "",NULL,0,NULL},
{"adm-startup", cmd_adm_startup, "",NULL,0,NULL},
+ {"explain", cmd_explain, "", NULL, 0, NULL},
+ {"options", cmd_options, "", NULL, 0, NULL},
+ {"zversion", cmd_zversion, "", NULL, 0, NULL},
{"help", cmd_help, "", NULL,0,NULL},
+ {"init", cmd_init, "", NULL,0,NULL},
{0,0,0,0,0,0}
};
#endif
if (codeset)
outputCharset = xstrdup(codeset);
+
+ ODR_MASK_SET(&z3950_options, Z_Options_search);
+ ODR_MASK_SET(&z3950_options, Z_Options_present);
+ ODR_MASK_SET(&z3950_options, Z_Options_namedResultSets);
+ ODR_MASK_SET(&z3950_options, Z_Options_triggerResourceCtrl);
+ ODR_MASK_SET(&z3950_options, Z_Options_scan);
+ ODR_MASK_SET(&z3950_options, Z_Options_sort);
+ ODR_MASK_SET(&z3950_options, Z_Options_extendedServices);
+ ODR_MASK_SET(&z3950_options, Z_Options_delSet);
while ((ret = options("k:c:q:a:b:m:v:p:u:t:Vxd:", argv, argc, &arg)) != -2)
{
projects / yaz-moved-to-github.git / blobdiff