/*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: client.c,v 1.278 2005-05-06 12:18:26 adam Exp $
+ * $Id: client.c,v 1.350 2007-08-21 13:19:44 adam Exp $
+ */
+/** \file client.c
+ * \brief yaz-client program
*/
#include <stdio.h>
#include <assert.h>
#include <time.h>
#include <ctype.h>
+#ifndef WIN32
+#include <signal.h>
+#endif
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <yaz/comstack.h>
+#include <yaz/oid_db.h>
+#define NO_OID 1
#include <yaz/proto.h>
#include <yaz/marcdisp.h>
#include <yaz/diagbib1.h>
#include <yaz/otherinfo.h>
#include <yaz/charneg.h>
+#include <yaz/query-charset.h>
#include <yaz/pquery.h>
#include <yaz/sortspec.h>
#include "admin.h"
#include "tabcomplete.h"
+#include "fhistory.h"
#define C_PROMPT "Z> "
+static file_history_t file_history = 0;
+
+static char *sru_method = "soap";
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
+#if YAZ_HAVE_XML2
static ODR srw_sr_odr_out = 0;
static Z_SRW_PDU *srw_sr = 0;
#endif
static Z_ElementSetNames *elementSetNames = 0;
static int setno = 1; /* current set offset */
static enum oid_proto protocol = PROTO_Z3950; /* current app protocol */
-static enum oid_value recordsyntax = VAL_USMARC;
+#define RECORDSYNTAX_MAX 20
+static char *recordsyntax_list[RECORDSYNTAX_MAX];
+static int recordsyntax_size = 0;
+
static char *record_schema = 0;
static int sent_close = 0;
static NMEM session_mem = NULL; /* memory handle for init-response */
-static Z_InitResponse *session = 0; /* session parameters */
+static Z_InitResponse *session_initResponse = 0; /* session parameters */
static char last_scan_line[512] = "0";
static char last_scan_query[512] = "0";
static char ccl_fields[512] = "default.bib";
static int negotiationCharsetVersion = 3;
static char *outputCharset = 0;
static char *marcCharset = 0;
+static char *queryCharset = 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 int auto_wait = 1;
static Odr_bitmask z3950_options;
static int z3950_version = 3;
static int scan_stepSize = 0;
static int scan_position = 1;
static int scan_size = 20;
static char cur_host[200];
+static int last_hit_count = 0;
typedef enum {
QueryType_Prefix,
static QueryType queryType = QueryType_Prefix;
static CCL_bibset bibset; /* CCL bibset handle */
-static cql_transform_t cqltrans; /* CQL context-set handle */
+static cql_transform_t cqltrans = 0; /* CQL context-set handle */
#if HAVE_READLINE_COMPLETION_OVER
int rl_attempted_completion_over = 0;
#endif
-/* set this one to 1, to avoid decode of unknown MARCs */
-#define AVOID_MARC_DECODE 1
-
#define maxOtherInfosSupported 10
-struct {
- int oidval;
+struct eoi {
+ Odr_oid oid[OID_SIZE];
char* value;
} extraOtherInfos[maxOtherInfosSupported];
-
void process_cmd_line(char* line);
-char ** readline_completer(char *text, int start, int end);
-char *command_generator(const char *text, int state);
-char** curret_global_list=NULL;
+#if HAVE_READLINE_READLINE_H
+char **readline_completer(char *text, int start, int end);
+#endif
+static char *command_generator(const char *text, int state);
int cmd_register_tab(const char* arg);
+int cmd_querycharset(const char *arg);
static void close_session (void);
-ODR getODROutputStream()
+ODR getODROutputStream(void)
{
return out;
}
{
if (hex_dump)
{
- int i,x;
- for( i=0; i<len ; i=i+16 )
- {
- printf(" %4.4d ",i);
- for(x=0 ; i+x<len && x<16; ++x)
- {
- printf("%2.2X ",(unsigned int)((unsigned char)buf[i+x]));
- }
- printf("\n");
- }
+ int i,x;
+ for( i=0; i<len ; i=i+16 )
+ {
+ printf(" %4.4d ",i);
+ for(x=0 ; i+x<len && x<16; ++x)
+ {
+ printf("%2.2X ",(unsigned int)((unsigned char)buf[i+x]));
+ }
+ 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);
- }
+ 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);
+ }
}
}
{
Z_OtherInformation **oi;
int i;
-
+
yaz_oi_APDU(a, &oi);
for(i=0; i<maxOtherInfosSupported; ++i)
{
- if(extraOtherInfos[i].oidval != -1)
- yaz_oi_set_string_oidval(oi, out, extraOtherInfos[i].oidval,
+ if (oid_oidlen(extraOtherInfos[i].oid) > 0)
+ yaz_oi_set_string_oid(oi, out, extraOtherInfos[i].oid,
1, extraOtherInfos[i].value);
}
}
ODR_MASK_ZERO(req->protocolVersion);
for (i = 0; i<z3950_version; i++)
- ODR_MASK_SET(req->protocolVersion, i);
+ ODR_MASK_SET(req->protocolVersion, i);
*req->maximumRecordSize = 1024*kilobytes;
*req->preferredMessageSize = 1024*kilobytes;
req->referenceId = set_refid (out);
- if (yazProxy && type_and_host)
- yaz_oi_set_string_oidval(&req->otherInfo, out, VAL_PROXY,
- 1, type_and_host);
+ if (yazProxy && type_and_host)
+ {
+ yaz_oi_set_string_oid(&req->otherInfo, out, yaz_oid_userinfo_proxy,
+ 1, type_and_host);
+ }
if (negotiationCharset || yazLang) {
- Z_OtherInformation **p;
- Z_OtherInformationUnit *p0;
-
- yaz_oi_APDU(apdu, &p);
-
- if ((p0=yaz_oi_update(p, out, NULL, 0, 0))) {
- ODR_MASK_SET(req->options, Z_Options_negotiationModel);
-
- p0->which = Z_OtherInfo_externallyDefinedInfo;
- p0->information.externallyDefinedInfo =
- yaz_set_proposal_charneg(
- out,
- (const char**)&negotiationCharset,
- negotiationCharset ? 1 : 0,
- (const char**)&yazLang, yazLang ? 1 : 0,
- negotiationCharsetRecords);
- }
+ Z_OtherInformation **p;
+ Z_OtherInformationUnit *p0;
+
+ yaz_oi_APDU(apdu, &p);
+
+ if ((p0=yaz_oi_update(p, out, NULL, 0, 0)))
+ {
+ ODR_MASK_SET(req->options, Z_Options_negotiationModel);
+
+ p0->which = Z_OtherInfo_externallyDefinedInfo;
+ p0->information.externallyDefinedInfo =
+ yaz_set_proposal_charneg_list(out, ",",
+ negotiationCharset,
+ yazLang,
+ negotiationCharsetRecords);
+ }
+ }
+ else if (ODR_MASK_GET(req->options, Z_Options_negotiationModel))
+ {
+ Z_OtherInformation **p;
+ Z_OtherInformationUnit *p0;
+
+ yaz_oi_APDU(apdu, &p);
+
+ if ((p0=yaz_oi_update(p, out, NULL, 0, 0)))
+ {
+ p0->which = Z_OtherInfo_externallyDefinedInfo;
+ p0->information.externallyDefinedInfo =
+ yaz_set_proposal_charneg(out, 0, 0, 0, 0, 0);
+ }
+
}
-
if (send_apdu(apdu))
printf("Sent initrequest.\n");
}
int ver = 0;
/* save session parameters for later use */
session_mem = odr_extract_mem(in);
- session = res;
+ session_initResponse = res;
for (ver = 0; ver < 8; ver++)
if (!ODR_MASK_GET(res->protocolVersion, ver))
printf("Version: %s\n", res->implementationVersion);
if (res->userInformationField)
{
- Z_External *uif = res->userInformationField;
- if (uif->which == Z_External_userInfo1) {
- render_initUserInfo(uif->u.userInfo1);
- } else {
- printf("UserInformationfield:\n");
- if (!z_External(print, (Z_External**)&uif, 0, 0))
- {
- odr_perror(print, "Printing userinfo\n");
- odr_reset(print);
- }
- if (uif->which == Z_External_octet) {
- printf("Guessing visiblestring:\n");
- printf("'%.*s'\n", uif->u.octet_aligned->len,
- uif->u.octet_aligned->buf);
- }
- else if (uif->which == Z_External_single)
- {
- Odr_any *sat = uif->u.single_ASN1_type;
- oident *oid = oid_getentbyoid(uif->direct_reference);
- if (oid->value == VAL_OCLCUI) {
- Z_OCLC_UserInformation *oclc_ui;
- ODR decode = odr_createmem(ODR_DECODE);
- odr_setbuf(decode, sat->buf, sat->len, 0);
- if (!z_OCLC_UserInformation(decode, &oclc_ui, 0, 0))
- printf ("Bad OCLC UserInformation:\n");
- else
- printf ("OCLC UserInformation:\n");
- if (!z_OCLC_UserInformation(print, &oclc_ui, 0, 0))
- printf ("Bad OCLC UserInformation spec\n");
- odr_destroy(decode);
- }
- else
- {
- /* Peek at any private Init-diagnostic APDUs */
- printf("### NAUGHTY: External is '%.*s'\n",
- sat->len, sat->buf);
- }
- }
- odr_reset (print);
- }
+ Z_External *uif = res->userInformationField;
+ if (uif->which == Z_External_userInfo1) {
+ render_initUserInfo(uif->u.userInfo1);
+ } else {
+ printf("UserInformationfield:\n");
+ if (!z_External(print, (Z_External**)&uif, 0, 0))
+ {
+ odr_perror(print, "Printing userinfo\n");
+ odr_reset(print);
+ }
+ if (uif->which == Z_External_octet) {
+ printf("Guessing visiblestring:\n");
+ printf("'%.*s'\n", uif->u.octet_aligned->len,
+ uif->u.octet_aligned->buf);
+ }
+ else if (uif->which == Z_External_single)
+ {
+ Odr_any *sat = uif->u.single_ASN1_type;
+ if (!oid_oidcmp(uif->direct_reference,
+ yaz_oid_userinfo_oclc_userinfo))
+ {
+ Z_OCLC_UserInformation *oclc_ui;
+ ODR decode = odr_createmem(ODR_DECODE);
+ odr_setbuf(decode, (char *) sat->buf, sat->len, 0);
+ if (!z_OCLC_UserInformation(decode, &oclc_ui, 0, 0))
+ printf ("Bad OCLC UserInformation:\n");
+ else
+ printf ("OCLC UserInformation:\n");
+ if (!z_OCLC_UserInformation(print, &oclc_ui, 0, 0))
+ printf ("Bad OCLC UserInformation spec\n");
+ odr_destroy(decode);
+ }
+ else
+ {
+ /* Peek at any private Init-diagnostic APDUs */
+ printf("### NAUGHTY: External is '%.*s'\n",
+ sat->len, sat->buf);
+ }
+ }
+ odr_reset (print);
+ }
}
printf ("Options:");
yaz_init_opt_decode(res->options, pr_opt, 0);
if (ODR_MASK_GET(res->options, Z_Options_negotiationModel)) {
- Z_CharSetandLanguageNegotiation *p =
- yaz_get_charneg_record(res->otherInfo);
-
- if (p) {
-
+ Z_CharSetandLanguageNegotiation *p =
+ yaz_get_charneg_record(res->otherInfo);
+
+ if (p)
+ {
char *charset=NULL, *lang=NULL;
int selected;
yaz_get_response_charneg(session_mem, p, &charset, &lang,
&selected);
- 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");
+ printf("Accepted character set : %s\n", charset ? charset:"none");
+ printf("Accepted code language : %s\n", lang ? lang:"none");
printf("Accepted records in ...: %d\n", selected );
- }
+
+ if (outputCharset && charset)
+ {
+ printf("Converting between %s and %s\n",
+ outputCharset, charset);
+ odr_set_charset(out, charset, outputCharset);
+ odr_set_charset(in, outputCharset, charset);
+ cmd_querycharset(charset);
+ }
+ else
+ {
+ odr_set_charset(out, 0, 0);
+ odr_set_charset(in, 0, 0);
+ }
+ }
}
fflush (stdout);
return 0;
static 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");
+ ui1->num_elements, ui1->num_elements == 1 ? "" : "s");
for (i = 0; i < ui1->num_elements; i++) {
- Z_OtherInformationUnit *unit = ui1->list[i];
- printf(" %d: otherInfo unit contains ", i+1);
- if (unit->which == Z_OtherInfo_externallyDefinedInfo &&
- unit->information.externallyDefinedInfo &&
- unit->information.externallyDefinedInfo->which ==
- Z_External_diag1) {
- render_diag(unit->information.externallyDefinedInfo->u.diag1);
- }
- else if (unit->which != Z_OtherInfo_externallyDefinedInfo)
- {
- printf("unsupported otherInfo unit->which = %d\n", unit->which);
- }
- else
- {
- printf("unsupported otherInfo unit external %d\n",
- unit->information.externallyDefinedInfo ?
- unit->information.externallyDefinedInfo->which : -2);
- }
+ Z_OtherInformationUnit *unit = ui1->list[i];
+ printf(" %d: otherInfo unit contains ", i+1);
+ if (unit->which == Z_OtherInfo_externallyDefinedInfo &&
+ unit->information.externallyDefinedInfo &&
+ unit->information.externallyDefinedInfo->which ==
+ Z_External_diag1) {
+ render_diag(unit->information.externallyDefinedInfo->u.diag1);
+ }
+ else if (unit->which != Z_OtherInfo_externallyDefinedInfo)
+ {
+ printf("unsupported otherInfo unit->which = %d\n", unit->which);
+ }
+ else
+ {
+ printf("unsupported otherInfo unit external %d\n",
+ unit->information.externallyDefinedInfo ?
+ unit->information.externallyDefinedInfo->which : -2);
+ }
}
}
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");
+ 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");
}
}
return 1;
}
+static int parse_cmd_doc(const char **arg, ODR out, char **buf,
+ int *len, int opt)
+{
+ const char *sep;
+ while (**arg && strchr(" \t\n\r\f", **arg))
+ (*arg)++;
+ if ((*arg)[0] == '\"' && (sep=strchr(*arg+1, '"')))
+ {
+ (*arg)++;
+ *len = sep - *arg;
+ *buf = odr_strdupn(out, *arg, *len);
+ (*arg) = sep+1;
+ return 1;
+ }
+ else if ((*arg)[0] && (*arg)[0] != '\"')
+ {
+ long fsize;
+ FILE *inf;
+ const char *fname = *arg;
+
+ while (**arg != '\0' && **arg != ' ')
+ (*arg)++;
+
+ inf = fopen(fname, "rb");
+ if (!inf)
+ {
+ printf("Couldn't open %s\n", fname);
+ return 0;
+ }
+ if (fseek(inf, 0L, SEEK_END) == -1)
+ {
+ printf("Couldn't seek in %s\n", fname);
+ fclose(inf);
+ return 0;
+ }
+ fsize = ftell(inf);
+ if (fseek(inf, 0L, SEEK_SET) == -1)
+ {
+ printf("Couldn't seek in %s\n", fname);
+ fclose(inf);
+ return 0;
+ }
+ *len = fsize;
+ *buf = (char *) odr_malloc(out, fsize);
+ if (fread(*buf, 1, fsize, inf) != fsize)
+ {
+ printf("Unable to read %s\n", fname);
+ fclose(inf);
+ return 0;
+ }
+ fclose(inf);
+ return 1;
+ }
+ else if (**arg == '\0')
+ {
+ if (opt)
+ {
+ *len = 0;
+ *buf = 0;
+ return 1;
+ }
+ printf("Missing doc argument\n");
+ }
+ else
+ printf("Bad doc argument %s\n", *arg);
+ return 0;
+}
+
static int cmd_base(const char *arg)
{
if (!*arg)
if (conn)
{
cs_close (conn);
- conn = NULL;
- if (session_mem)
- {
- nmem_destroy (session_mem);
- session_mem = NULL;
- }
+ conn = 0;
}
+ if (session_mem)
+ {
+ nmem_destroy (session_mem);
+ session_mem = NULL;
+ session_initResponse = 0;
+ }
cs_get_host_args(arg, &basep);
strncpy(type_and_host, arg, sizeof(type_and_host)-1);
conn = cs_create_host(arg, 1, &add);
if (!conn)
{
- printf ("Couldn't create comstack\n");
+ printf ("Could not resolve address %s\n", arg);
return 0;
}
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
if (conn->protocol == PROTO_HTTP)
- queryType = QueryType_CQL;
+ queryType = QueryType_CQL;
#else
if (conn->protocol == PROTO_HTTP)
{
if (cs_connect(conn, add) < 0)
{
printf ("error = %s\n", cs_strerror(conn));
- if (conn->cerrno == CSYSERR)
- {
- char msg[256];
- yaz_strerror(msg, sizeof(msg));
- printf ("%s\n", msg);
- }
cs_close(conn);
conn = 0;
return 0;
#if HAVE_OPENSSL_SSL_H
if ((ssl = (SSL *) cs_get_ssl(conn)))
{
- X509 *server_cert = SSL_get_peer_certificate (ssl);
-
- if (server_cert)
- {
- char *pem_buf;
- int pem_len;
- BIO *bio = BIO_new(BIO_s_mem());
+ X509 *server_cert = SSL_get_peer_certificate (ssl);
- /* get PEM buffer in memory */
- PEM_write_bio_X509(bio, server_cert);
- pem_len = BIO_get_mem_data(bio, &pem_buf);
- fwrite(pem_buf, pem_len, 1, stdout);
-
- /* print all info on screen .. */
- X509_print_fp(stdout, server_cert);
- BIO_free(bio);
+ if (server_cert)
+ {
+ char *pem_buf;
+ int pem_len;
+ BIO *bio = BIO_new(BIO_s_mem());
+
+ /* get PEM buffer in memory */
+ PEM_write_bio_X509(bio, server_cert);
+ pem_len = BIO_get_mem_data(bio, &pem_buf);
+ fwrite(pem_buf, pem_len, 1, stdout);
+
+ /* print all info on screen .. */
+ X509_print_fp(stdout, server_cert);
+ BIO_free(bio);
- X509_free (server_cert);
- }
+ X509_free (server_cert);
+ }
}
#endif
if (basep && *basep)
return session_connect(cur_host);
}
-void try_reconnect()
+void try_reconnect(void)
{
char* open_command;
-
+
if(!( auto_reconnect && last_open_command) ) return ;
open_command = (char *) xmalloc (strlen(last_open_command)+6);
strcpy (open_command, "open ");
-
+
strcat (open_command, last_open_command);
process_cmd_line(open_command);
-
- xfree(open_command);
+
+ xfree(open_command);
}
int cmd_authentication(const char *arg)
if (r == 1)
{
auth = &au;
- 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 (!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)
{
idPass.groupId = NULL;
idPass.userId = user;
idPass.password = group;
- printf("Authentication set to User (%s), Pass (%s)\n", user, group);
+ printf("Authentication set to User (%s), Pass (%s)\n", user, group);
}
if (r == 3)
{
idPass.groupId = group;
idPass.userId = user;
idPass.password = pass;
- printf("Authentication set to User (%s), Group (%s), Pass (%s)\n",
- user, group, pass);
+ printf("Authentication set to User (%s), Group (%s), Pass (%s)\n",
+ user, group, pass);
}
return 1;
}
static void display_record(Z_External *r)
{
- oident *ent = oid_getentbyoid(r->direct_reference);
-
+ const Odr_oid *oid = r->direct_reference;
+
record_last = r;
/*
* Tell the user what we got.
*/
- if (r->direct_reference)
+ if (oid)
{
+ oid_class oclass;
+ char oid_name_buf[OID_STR_MAX];
+ const char *oid_name
+ = yaz_oid_to_string_buf(oid, &oclass, oid_name_buf);
printf("Record type: ");
- if (ent)
- printf("%s\n", ent->desc);
- else if (!odr_oid(print, &r->direct_reference, 0, 0))
- {
- odr_perror(print, "print oid");
- odr_reset(print);
- }
+ if (oid_name)
+ printf("%s\n", oid_name);
}
/* Check if this is a known, ASN.1 type tucked away in an octet string */
- if (ent && r->which == Z_External_octet)
+ if (r->which == Z_External_octet)
{
- Z_ext_typeent *type = z_ext_getentbyref(ent->value);
+ Z_ext_typeent *type = z_ext_getentbyref(r->direct_reference);
char *rr;
if (type)
if (!(*type->fun)(in, &rr, 0, 0))
{
odr_perror(in, "Decoding constructed record.");
- fprintf(stdout, "[Near %d]\n", odr_offset(in));
+ fprintf(stdout, "[Near %ld]\n", (long) odr_offset(in));
fprintf(stdout, "Packet dump:\n---------\n");
odr_dumpBER(stdout, (char*)r->u.octet_aligned->buf,
r->u.octet_aligned->len);
fprintf(stdout, "---------\n");
- /* note just ignores the error ant print the bytes form the octet_aligned later */
+ /* note just ignores the error ant print the bytes form the octet_aligned later */
} else {
/*
* Note: we throw away the original, BER-encoded record here.
}
}
}
- if (ent && ent->value == VAL_SOIF)
+ if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_soif))
{
print_record((const unsigned char *) r->u.octet_aligned->buf,
r->u.octet_aligned->len);
if (marc_file)
fwrite (r->u.octet_aligned->buf, 1, r->u.octet_aligned->len, marc_file);
}
- else if (r->which == Z_External_octet)
+ else if (oid && r->which == Z_External_octet)
{
const char *octet_buf = (char*)r->u.octet_aligned->buf;
- if (ent->oclass == CLASS_RECSYN &&
- (ent->value == VAL_TEXT_XML ||
- ent->value == VAL_APPLICATION_XML ||
- ent->value == VAL_HTML))
+ if (oid && (!oid_oidcmp(oid, yaz_oid_recsyn_xml)
+ || !oid_oidcmp(oid, yaz_oid_recsyn_xml)
+ || !oid_oidcmp(oid, yaz_oid_recsyn_html)))
{
print_record((const unsigned char *) octet_buf,
r->u.octet_aligned->len);
}
- else if (ent->value == VAL_POSTSCRIPT)
+ else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_postscript))
{
int size = r->u.octet_aligned->len;
if (size > 100)
}
else
{
- if (
-#if AVOID_MARC_DECODE
- /* primitive check for a marc OID 5.1-29 except 16 */
- ent->oidsuffix[0] == 5 && ent->oidsuffix[1] < 30 &&
- ent->oidsuffix[1] != 16
-#else
- 1
-#endif
- )
+ if (oid && yaz_oid_is_iso2709(oid))
{
- char *result;
- int rlen;
+ const char *result;
+ size_t rlen;
yaz_iconv_t cd = 0;
yaz_marc_t mt = yaz_marc_create();
-
- if (yaz_marc_decode_buf(mt, octet_buf,r->u.octet_aligned->len,
- &result, &rlen)> 0)
+ const char *from = 0;
+
+ if (marcCharset && !strcmp(marcCharset, "auto"))
{
- char *from = 0;
- if (marcCharset && !strcmp(marcCharset, "auto"))
+ if (!oid_oidcmp(oid, yaz_oid_recsyn_usmarc))
{
- if (ent->value == VAL_USMARC)
- {
- if (octet_buf[9] == 'a')
- from = "UTF-8";
- else
- from = "MARC-8";
- }
+ if (octet_buf[9] == 'a')
+ from = "UTF-8";
else
- from = "ISO-8859-1";
- }
- else if (marcCharset)
- from = marcCharset;
- if (outputCharset && from)
- {
- cd = yaz_iconv_open(outputCharset, from);
- printf ("convert from %s to %s", from,
- outputCharset);
- if (!cd)
- printf (" unsupported\n");
- else
- printf ("\n");
+ from = "MARC-8";
}
+ else
+ from = "ISO-8859-1";
+ }
+ else if (marcCharset)
+ from = marcCharset;
+ if (outputCharset && from)
+ {
+ cd = yaz_iconv_open(outputCharset, from);
+ printf ("convert from %s to %s", from,
+ outputCharset);
if (!cd)
- fwrite (result, 1, rlen, stdout);
+ printf (" unsupported\n");
else
{
- char outbuf[6];
- size_t inbytesleft = rlen;
- const char *inp = result;
-
- while (inbytesleft)
- {
- size_t outbytesleft = sizeof(outbuf);
- char *outp = outbuf;
- size_t r;
-
- r = yaz_iconv (cd, (char**) &inp,
- &inbytesleft,
- &outp, &outbytesleft);
- if (r == (size_t) (-1))
- {
- int e = yaz_iconv_error(cd);
- if (e != YAZ_ICONV_E2BIG)
- break;
- }
- fwrite (outbuf, outp - outbuf, 1, stdout);
- }
+ yaz_marc_iconv(mt, cd);
+ printf ("\n");
}
}
- else
+
+ if (yaz_marc_decode_buf(mt, octet_buf, r->u.octet_aligned->len,
+ &result, &rlen)> 0)
+ {
+ fwrite (result, rlen, 1, stdout);
+ }
+ else
{
printf ("bad MARC. Dumping as it is:\n");
print_record((const unsigned char*) octet_buf,
r->u.octet_aligned->len);
- }
+ }
yaz_marc_destroy(mt);
if (cd)
yaz_iconv_close(cd);
if (marc_file)
fwrite (octet_buf, 1, r->u.octet_aligned->len, marc_file);
}
- else if (ent && ent->value == VAL_SUTRS)
+ else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_sutrs))
{
if (r->which != Z_External_sutrs)
{
if (marc_file)
fwrite (r->u.sutrs->buf, 1, r->u.sutrs->len, marc_file);
}
- else if (ent && ent->value == VAL_GRS1)
+ else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_grs_1))
{
WRBUF w;
if (r->which != Z_External_grs1)
}
w = wrbuf_alloc();
yaz_display_grs1(w, r->u.grs1, 0);
- puts (wrbuf_buf(w));
- wrbuf_free(w, 1);
- }
- else if (ent && ent->value == VAL_OPAC)
- {
- int i;
- if (r->u.opac->bibliographicRecord)
- display_record(r->u.opac->bibliographicRecord);
- for (i = 0; i<r->u.opac->num_holdingsData; i++)
- {
- Z_HoldingsRecord *h = r->u.opac->holdingsData[i];
- if (h->which == Z_HoldingsRecord_marcHoldingsRecord)
- {
- printf ("MARC holdings %d\n", i);
- display_record(h->u.marcHoldingsRecord);
- }
- else if (h->which == Z_HoldingsRecord_holdingsAndCirc)
- {
- int j;
-
- Z_HoldingsAndCircData *data = h->u.holdingsAndCirc;
-
- printf ("Data holdings %d\n", i);
- if (data->typeOfRecord)
- printf ("typeOfRecord: %s\n", data->typeOfRecord);
- if (data->encodingLevel)
- printf ("encodingLevel: %s\n", data->encodingLevel);
- if (data->receiptAcqStatus)
- printf ("receiptAcqStatus: %s\n", data->receiptAcqStatus);
- if (data->generalRetention)
- printf ("generalRetention: %s\n", data->generalRetention);
- if (data->completeness)
- printf ("completeness: %s\n", data->completeness);
- if (data->dateOfReport)
- printf ("dateOfReport: %s\n", data->dateOfReport);
- if (data->nucCode)
- printf ("nucCode: %s\n", data->nucCode);
- if (data->localLocation)
- printf ("localLocation: %s\n", data->localLocation);
- if (data->shelvingLocation)
- printf ("shelvingLocation: %s\n", data->shelvingLocation);
- if (data->callNumber)
- printf ("callNumber: %s\n", data->callNumber);
- if (data->shelvingData)
- printf ("shelvingData: %s\n", data->shelvingData);
- if (data->copyNumber)
- printf ("copyNumber: %s\n", data->copyNumber);
- if (data->publicNote)
- printf ("publicNote: %s\n", data->publicNote);
- if (data->reproductionNote)
- printf ("reproductionNote: %s\n", data->reproductionNote);
- if (data->termsUseRepro)
- printf ("termsUseRepro: %s\n", data->termsUseRepro);
- if (data->enumAndChron)
- printf ("enumAndChron: %s\n", data->enumAndChron);
- for (j = 0; j<data->num_volumes; j++)
- {
- printf ("volume %d\n", j);
- if (data->volumes[j]->enumeration)
- printf (" enumeration: %s\n",
- data->volumes[j]->enumeration);
- if (data->volumes[j]->chronology)
- printf (" chronology: %s\n",
- data->volumes[j]->chronology);
- if (data->volumes[j]->enumAndChron)
- printf (" enumAndChron: %s\n",
- data->volumes[j]->enumAndChron);
- }
- for (j = 0; j<data->num_circulationData; j++)
- {
- printf ("circulation %d\n", j);
- if (data->circulationData[j]->availableNow)
- printf (" availableNow: %d\n",
- *data->circulationData[j]->availableNow);
- if (data->circulationData[j]->availablityDate)
- printf (" availabiltyDate: %s\n",
- data->circulationData[j]->availablityDate);
- if (data->circulationData[j]->availableThru)
- printf (" availableThru: %s\n",
- data->circulationData[j]->availableThru);
- if (data->circulationData[j]->restrictions)
- printf (" restrictions: %s\n",
- data->circulationData[j]->restrictions);
- if (data->circulationData[j]->itemId)
- printf (" itemId: %s\n",
- data->circulationData[j]->itemId);
- if (data->circulationData[j]->renewable)
- printf (" renewable: %d\n",
- *data->circulationData[j]->renewable);
- if (data->circulationData[j]->onHold)
- printf (" onHold: %d\n",
- *data->circulationData[j]->onHold);
- if (data->circulationData[j]->enumAndChron)
- printf (" enumAndChron: %s\n",
- data->circulationData[j]->enumAndChron);
- if (data->circulationData[j]->midspine)
- printf (" midspine: %s\n",
- data->circulationData[j]->midspine);
- if (data->circulationData[j]->temporaryLocation)
- printf (" temporaryLocation: %s\n",
- data->circulationData[j]->temporaryLocation);
- }
- }
- }
+ puts (wrbuf_cstr(w));
+ wrbuf_destroy(w);
+ }
+ else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_opac))
+ {
+ int i;
+ if (r->u.opac->bibliographicRecord)
+ display_record(r->u.opac->bibliographicRecord);
+ for (i = 0; i<r->u.opac->num_holdingsData; i++)
+ {
+ Z_HoldingsRecord *h = r->u.opac->holdingsData[i];
+ if (h->which == Z_HoldingsRecord_marcHoldingsRecord)
+ {
+ printf ("MARC holdings %d\n", i);
+ display_record(h->u.marcHoldingsRecord);
+ }
+ else if (h->which == Z_HoldingsRecord_holdingsAndCirc)
+ {
+ int j;
+
+ Z_HoldingsAndCircData *data = h->u.holdingsAndCirc;
+
+ printf ("Data holdings %d\n", i);
+ if (data->typeOfRecord)
+ printf ("typeOfRecord: %s\n", data->typeOfRecord);
+ if (data->encodingLevel)
+ printf ("encodingLevel: %s\n", data->encodingLevel);
+ if (data->receiptAcqStatus)
+ printf ("receiptAcqStatus: %s\n", data->receiptAcqStatus);
+ if (data->generalRetention)
+ printf ("generalRetention: %s\n", data->generalRetention);
+ if (data->completeness)
+ printf ("completeness: %s\n", data->completeness);
+ if (data->dateOfReport)
+ printf ("dateOfReport: %s\n", data->dateOfReport);
+ if (data->nucCode)
+ printf ("nucCode: %s\n", data->nucCode);
+ if (data->localLocation)
+ printf ("localLocation: %s\n", data->localLocation);
+ if (data->shelvingLocation)
+ printf ("shelvingLocation: %s\n", data->shelvingLocation);
+ if (data->callNumber)
+ printf ("callNumber: %s\n", data->callNumber);
+ if (data->shelvingData)
+ printf ("shelvingData: %s\n", data->shelvingData);
+ if (data->copyNumber)
+ printf ("copyNumber: %s\n", data->copyNumber);
+ if (data->publicNote)
+ printf ("publicNote: %s\n", data->publicNote);
+ if (data->reproductionNote)
+ printf ("reproductionNote: %s\n", data->reproductionNote);
+ if (data->termsUseRepro)
+ printf ("termsUseRepro: %s\n", data->termsUseRepro);
+ if (data->enumAndChron)
+ printf ("enumAndChron: %s\n", data->enumAndChron);
+ for (j = 0; j<data->num_volumes; j++)
+ {
+ printf ("volume %d\n", j);
+ if (data->volumes[j]->enumeration)
+ printf (" enumeration: %s\n",
+ data->volumes[j]->enumeration);
+ if (data->volumes[j]->chronology)
+ printf (" chronology: %s\n",
+ data->volumes[j]->chronology);
+ if (data->volumes[j]->enumAndChron)
+ printf (" enumAndChron: %s\n",
+ data->volumes[j]->enumAndChron);
+ }
+ for (j = 0; j<data->num_circulationData; j++)
+ {
+ printf ("circulation %d\n", j);
+ if (data->circulationData[j]->availableNow)
+ printf (" availableNow: %d\n",
+ *data->circulationData[j]->availableNow);
+ if (data->circulationData[j]->availablityDate)
+ printf (" availabiltyDate: %s\n",
+ data->circulationData[j]->availablityDate);
+ if (data->circulationData[j]->availableThru)
+ printf (" availableThru: %s\n",
+ data->circulationData[j]->availableThru);
+ if (data->circulationData[j]->restrictions)
+ printf (" restrictions: %s\n",
+ data->circulationData[j]->restrictions);
+ if (data->circulationData[j]->itemId)
+ printf (" itemId: %s\n",
+ data->circulationData[j]->itemId);
+ if (data->circulationData[j]->renewable)
+ printf (" renewable: %d\n",
+ *data->circulationData[j]->renewable);
+ if (data->circulationData[j]->onHold)
+ printf (" onHold: %d\n",
+ *data->circulationData[j]->onHold);
+ if (data->circulationData[j]->enumAndChron)
+ printf (" enumAndChron: %s\n",
+ data->circulationData[j]->enumAndChron);
+ if (data->circulationData[j]->midspine)
+ printf (" midspine: %s\n",
+ data->circulationData[j]->midspine);
+ if (data->circulationData[j]->temporaryLocation)
+ printf (" temporaryLocation: %s\n",
+ data->circulationData[j]->temporaryLocation);
+ }
+ }
+ }
}
else
{
static void display_diagrecs(Z_DiagRec **pp, int num)
{
int i;
- oident *ent;
Z_DefaultDiagFormat *r;
printf("Diagnostic message(s) from database:\n");
}
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");
+
+ if (!r->diagnosticSetId)
+ printf("Missing diagset\n");
+ else
+ {
+ oid_class oclass;
+ char diag_name_buf[OID_STR_MAX];
+ const char *diag_name = 0;
+ diag_name = yaz_oid_to_string_buf
+ (r->diagnosticSetId, &oclass, diag_name_buf);
+ if (oid_oidcmp(r->diagnosticSetId, yaz_oid_diagset_bib_1))
+ printf("Unknown diagset: %s\n", diag_name);
+ }
printf(" [%d] %s", *r->condition, diagbib1_str(*r->condition));
switch (r->which)
{
return 2;
}
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
static int send_srw(Z_SRW_PDU *sr)
{
const char *charset = negotiationCharset;
const char *host_port = cur_host;
- char *path = 0;
- char ctype[50];
- Z_SOAP_Handler h[2] = {
- {"http://www.loc.gov/zing/srw/", 0, (Z_SOAP_fun) yaz_srw_codec},
- {0, 0, 0}
- };
- ODR o = odr_createmem(ODR_ENCODE);
- int ret;
- Z_SOAP *p = odr_malloc(o, sizeof(*p));
Z_GDU *gdu;
+ char *path = 0;
- path = odr_malloc(out, strlen(databaseNames[0])+2);
+ path = (char *) odr_malloc(out, 2+strlen(databaseNames[0]));
*path = '/';
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);
+ gdu = z_get_HTTP_Request_host_path(out, host_port, path);
- if (host_port)
+ if (!strcmp(sru_method, "get"))
{
- const char *cp0 = strstr(host_port, "://");
- const char *cp1 = 0;
- if (cp0)
- cp0 = cp0+3;
- else
- cp0 = host_port;
-
- cp1 = strchr(cp0, '/');
- if (!cp1)
- cp1 = cp0+strlen(cp0);
-
- if (cp0 && cp1)
- {
- char *h = odr_malloc(out, cp1 - cp0 + 1);
- memcpy (h, cp0, cp1 - cp0);
- h[cp1-cp0] = '\0';
- z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers,
- "Host", h);
- }
+ yaz_sru_get_encode(gdu->u.HTTP_Request, sr, out, charset);
}
-
- strcpy(ctype, "text/xml");
- if (charset && strlen(charset) < 20)
+ else if (!strcmp(sru_method, "post"))
{
- strcat(ctype, "; charset=");
- strcat(ctype, charset);
+ yaz_sru_post_encode(gdu->u.HTTP_Request, sr, out, charset);
+ }
+ else if (!strcmp(sru_method, "soap"))
+ {
+ yaz_sru_soap_encode(gdu->u.HTTP_Request, sr, out, charset);
}
- z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers,
- "Content-Type", ctype);
- z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers,
- "SOAPAction", "\"\"");
- p->which = Z_SOAP_generic;
- p->u.generic = odr_malloc(o, sizeof(*p->u.generic));
- p->u.generic->no = 0;
- p->u.generic->ns = 0;
- p->u.generic->p = sr;
- p->ns = "http://schemas.xmlsoap.org/soap/envelope/";
-
- ret = z_soap_codec_enc(o, &p,
- &gdu->u.HTTP_Request->content_buf,
- &gdu->u.HTTP_Request->content_len, h,
- charset);
if (z_GDU(out, &gdu, 0, 0))
{
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);
- }
+ if (apdu_file)
+ {
+ if (!z_GDU(print, &gdu, 0, 0))
+ printf ("Failed to print outgoing SRU package\n");
+ odr_reset(print);
+ }
buf_out = odr_getbuf(out, &len_out, 0);
/* we don't odr_reset(out), since we may need the buffer again */
- do_hex_dump(buf_out, len_out);
+ do_hex_dump(buf_out, len_out);
r = cs_put(conn, buf_out, len_out);
- odr_destroy(o);
-
if (r >= 0)
return 2;
}
}
#endif
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
static char *encode_SRW_term(ODR o, const char *q)
{
const char *in_charset = "ISO-8859-1";
yaz_iconv_t cd;
char *res;
if (outputCharset)
- in_charset = in_charset;
+ in_charset = outputCharset;
cd = yaz_iconv_open("UTF-8", in_charset);
if (!cd)
{
- wrbuf_free(w, 1);
- return odr_strdup(o, q);
+ wrbuf_destroy(w);
+ return odr_strdup(o, q);
}
wrbuf_iconv_write(w, cd, q, strlen(q));
if (wrbuf_len(w))
- {
- int len = wrbuf_len(w);
- res = odr_strdupn(o, wrbuf_buf(w), len);
- }
+ res = odr_strdup(o, wrbuf_cstr(w));
else
- res = odr_strdup(o, q);
+ res = odr_strdup(o, q);
yaz_iconv_close(cd);
- wrbuf_free(w, 1);
+ wrbuf_destroy(w);
return res;
}
switch(queryType)
{
case QueryType_CQL:
- sr->u.scan_request->query_type = Z_SRW_query_type_cql;
- sr->u.scan_request->scanClause.cql = encode_SRW_term(out, arg);
- break;
+ sr->u.scan_request->query_type = Z_SRW_query_type_cql;
+ sr->u.scan_request->scanClause.cql = encode_SRW_term(out, arg);
+ break;
case QueryType_Prefix:
- sr->u.scan_request->query_type = Z_SRW_query_type_pqf;
- sr->u.scan_request->scanClause.pqf = encode_SRW_term(out, arg);
- break;
+ sr->u.scan_request->query_type = Z_SRW_query_type_pqf;
+ sr->u.scan_request->scanClause.pqf = encode_SRW_term(out, arg);
+ break;
default:
- printf ("Only CQL and PQF supported in SRW\n");
- return 0;
+ printf ("Only CQL and PQF supported in SRW\n");
+ return 0;
}
sr->u.scan_request->responsePosition = odr_intdup(out, pos);
sr->u.scan_request->maximumTerms = odr_intdup(out, num);
switch(queryType)
{
case QueryType_CQL:
- srw_sr->u.request->query_type = Z_SRW_query_type_cql;
- srw_sr->u.request->query.cql = encode_SRW_term(srw_sr_odr_out, arg);
+ srw_sr->u.request->query_type = Z_SRW_query_type_cql;
+ srw_sr->u.request->query.cql = encode_SRW_term(srw_sr_odr_out, arg);
- sr->u.request->query_type = Z_SRW_query_type_cql;
- sr->u.request->query.cql = encode_SRW_term(srw_sr_odr_out, arg);
- break;
+ sr->u.request->query_type = Z_SRW_query_type_cql;
+ sr->u.request->query.cql = encode_SRW_term(srw_sr_odr_out, arg);
+ break;
case QueryType_Prefix:
- srw_sr->u.request->query_type = Z_SRW_query_type_pqf;
- srw_sr->u.request->query.pqf = encode_SRW_term(srw_sr_odr_out, arg);
+ srw_sr->u.request->query_type = Z_SRW_query_type_pqf;
+ srw_sr->u.request->query.pqf = encode_SRW_term(srw_sr_odr_out, arg);
- sr->u.request->query_type = Z_SRW_query_type_pqf;
- sr->u.request->query.pqf = encode_SRW_term(srw_sr_odr_out, arg);
- break;
+ sr->u.request->query_type = Z_SRW_query_type_pqf;
+ sr->u.request->query.pqf = encode_SRW_term(srw_sr_odr_out, arg);
+ break;
default:
- printf ("Only CQL and PQF supported in SRW\n");
- return 0;
+ printf ("Only CQL and PQF supported in SRW\n");
+ return 0;
}
sr->u.request->maximumRecords = odr_intdup(out, 0);
if (record_schema)
sr->u.request->recordSchema = record_schema;
- if (recordsyntax == VAL_TEXT_XML)
- sr->u.explain_request->recordPacking = "xml";
+ if (recordsyntax_size == 1 && !yaz_matchstr(recordsyntax_list[0], "xml"))
+ sr->u.request->recordPacking = "xml";
return send_srw(sr);
}
#endif
+static void query_charset_convert(Z_RPNQuery *q)
+{
+ if (queryCharset && outputCharset)
+ {
+ yaz_iconv_t cd = yaz_iconv_open(queryCharset, outputCharset);
+ if (!cd)
+ {
+ printf("Conversion from %s to %s unsupported\n",
+ outputCharset, queryCharset);
+ return;
+ }
+ yaz_query_charset_convert_rpnquery(q, out, cd);
+ yaz_iconv_close(cd);
+ }
+}
+
static int send_searchRequest(const char *arg)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest);
return 0;
}
} else if (myQueryType == QueryType_CQL2RPN) {
- /* ### All this code should be wrapped in a utility function */
- CQL_parser parser;
- struct cql_node *node;
- const char *addinfo;
- if (cqltrans == 0) {
+ /* ### All this code should be wrapped in a utility function */
+ CQL_parser parser;
+ struct cql_node *node;
+ const char *addinfo;
+ if (cqltrans == 0) {
printf("Can't use CQL: no translation file. Try set_cqlfile\n");
- return 0;
- }
- parser = cql_parser_create();
- if ((error = cql_parser_string(parser, arg)) != 0) {
+ return 0;
+ }
+ parser = cql_parser_create();
+ if ((error = cql_parser_string(parser, arg)) != 0) {
printf("Can't parse CQL: must be a syntax error\n");
return 0;
- }
- node = cql_parser_result(parser);
- if ((error = cql_transform_buf(cqltrans, node, pqfbuf,
- sizeof pqfbuf)) != 0) {
- error = cql_transform_error(cqltrans, &addinfo);
- printf ("Can't convert CQL to PQF: %s (addinfo=%s)\n",
- cql_strerror(error), addinfo);
+ }
+ node = cql_parser_result(parser);
+ if ((error = cql_transform_buf(cqltrans, node, pqfbuf,
+ sizeof pqfbuf)) != 0) {
+ error = cql_transform_error(cqltrans, &addinfo);
+ printf ("Can't convert CQL to PQF: %s (addinfo=%s)\n",
+ cql_strerror(error), addinfo);
return 0;
}
- arg = pqfbuf;
- myQueryType = QueryType_Prefix;
+ arg = pqfbuf;
+ myQueryType = QueryType_Prefix;
}
req->referenceId = set_refid (out);
if (smallSetUpperBound > 0 || (largeSetLowerBound > 1 &&
mediumSetPresentNumber > 0))
{
- req->preferredRecordSyntax =
- yaz_oidval_to_z3950oid(out, CLASS_RECSYN, recordsyntax);
+ if (recordsyntax_size)
+ req->preferredRecordSyntax =
+ yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_RECSYN, recordsyntax_list[0], out);
req->smallSetElementSetNames =
req->mediumSetElementSetNames = elementSetNames;
const char *pqf_msg;
size_t off;
int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off);
- printf("%*s^\n", off+4, "");
+ int ioff = off;
+ printf("%*s^\n", ioff+4, "");
printf("Prefix query error: %s (code %d)\n", pqf_msg, code);
yaz_pqf_destroy (pqf_parser);
return 0;
}
yaz_pqf_destroy (pqf_parser);
+ query_charset_convert(RPNquery);
query.u.type_1 = RPNquery;
break;
case QueryType_CCL:
printf ("Couldn't convert from CCL to RPN\n");
return 0;
}
+ query_charset_convert(RPNquery);
query.u.type_1 = RPNquery;
ccl_rpn_delete (rpn);
break;
}
/* display Query Expression as part of searchResult-1 */
-static void display_queryExpression (Z_QueryExpression *qe)
+static void display_queryExpression (const char *lead, Z_QueryExpression *qe)
{
if (!qe)
return;
+ printf(" %s=", lead);
if (qe->which == Z_QueryExpression_term)
{
if (qe->u.term->queryTerm)
switch (term->which)
{
case Z_Term_general:
- printf (" %.*s", term->u.general->len, term->u.general->buf);
+ printf ("%.*s", term->u.general->len, term->u.general->buf);
break;
case Z_Term_characterString:
- printf (" %s", term->u.characterString);
+ printf ("%s", term->u.characterString);
break;
case Z_Term_numeric:
- printf (" %d", *term->u.numeric);
+ printf ("%d", *term->u.numeric);
break;
case Z_Term_null:
- printf (" null");
+ printf ("null");
break;
}
}
printf ("SearchResult-1:");
for (j = 0; j < sr->num; j++)
{
+ if (j)
+ printf(",");
if (!sr->elements[j]->subqueryExpression)
- printf (" %d", j);
- display_queryExpression (
+ printf("%d", j);
+ display_queryExpression("term",
sr->elements[j]->subqueryExpression);
- display_queryExpression (
+ display_queryExpression("interpretation",
sr->elements[j]->subqueryInterpretation);
- display_queryExpression (
+ display_queryExpression("recommendation",
sr->elements[j]->subqueryRecommendation);
if (sr->elements[j]->subqueryCount)
- printf ("(%d)", *sr->elements[j]->subqueryCount);
+ printf(" cnt=%d", *sr->elements[j]->subqueryCount);
+ if (sr->elements[j]->subqueryId)
+ printf(" id=%s ", sr->elements[j]->subqueryId);
}
printf ("\n");
}
else
printf("Search was a bloomin' failure.\n");
printf("Number of hits: %d", *res->resultCount);
+ last_hit_count = *res->resultCount;
if (setnumber >= 0)
printf (", setno %d", setnumber);
- printf ("\n");
+ putchar('\n');
+ if (res->resultSetStatus)
+ {
+ printf("Result Set Status: ");
+ switch(*res->resultSetStatus)
+ {
+ case Z_SearchResponse_subset:
+ printf("subset"); break;
+ case Z_SearchResponse_interim:
+ printf("interim"); break;
+ case Z_SearchResponse_none:
+ printf("none"); break;
+ case Z_SearchResponse_estimate:
+ printf("estimate"); break;
+ default:
+ printf("%d", *res->resultSetStatus);
+ }
+ putchar('\n');
+ }
display_searchResult (res->additionalSearchInfo);
printf("records returned: %d\n",
*res->numberOfRecordsReturned);
{
if (pOid != NULL)
{
- int *pInt = pOid;
+ Odr_oid *pInt = pOid;
print_level(iLevel);
printf("%s:", pTag);
}
}
}
+ if (ext->which == Z_External_itemOrder)
+ {
+ Z_IOTaskPackage *otp = ext->u.itemOrder->u.taskPackage;
+ if (otp && otp->targetPart && otp->targetPart->itemRequest)
+ {
+ Z_External *ext = otp->targetPart->itemRequest;
+ if (ext->which == Z_External_octet)
+ {
+ Odr_oct *doc = ext->u.octet_aligned;
+ printf("Got itemRequest doc %.*s\n",
+ doc->len, doc->buf);
+ }
+ }
+ }
+ }
+ if (res->taskPackage && res->taskPackage->which == Z_External_octet)
+ {
+ Odr_oct *doc = res->taskPackage->u.octet_aligned;
+ printf("%.*s\n", doc->len, doc->buf);
}
}
return 0;
}
-static Z_External *create_external_itemRequest()
+static Z_External *create_external_itemRequest(void)
{
struct ill_get_ctl ctl;
ILL_ItemRequest *req;
}
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->direct_reference = odr_oiddup(out, yaz_oid_general_isoill_1);
r->indirect_reference = 0;
r->descriptor = 0;
r->which = Z_External_single;
}
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->direct_reference = odr_oiddup(out, yaz_oid_general_isoill_1);
r->indirect_reference = 0;
r->descriptor = 0;
r->which = Z_External_single;
r->u.single_ASN1_type->size = ill_request_size;
memcpy (r->u.single_ASN1_type->buf, ill_request_buf, ill_request_size);
/* printf ("len = %d\n", ill_request_size); */
-/* do_hex_dump(ill_request_buf,ill_request_size); */
-/* printf("--- end of extenal\n"); */
+/* do_hex_dump(ill_request_buf,ill_request_size); */
+/* printf("--- end of extenal\n"); */
}
return r;
static Z_External *create_ItemOrderExternal(const char *type, int itemno)
{
Z_External *r = (Z_External *) odr_malloc(out, sizeof(Z_External));
- oident ItemOrderRequest;
-
- ItemOrderRequest.proto = PROTO_Z3950;
- ItemOrderRequest.oclass = CLASS_EXTSERV;
- ItemOrderRequest.value = VAL_ITEMORDER;
-
- r->direct_reference = odr_oiddup(out,oid_getoidbyent(&ItemOrderRequest));
+ r->direct_reference = odr_oiddup(out, yaz_oid_extserv_item_order);
r->indirect_reference = 0;
r->descriptor = 0;
}
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>";
+ 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));
+ z_ext_record_oid(out, yaz_oid_recsyn_xml, xml_buf, strlen(xml_buf));
}
else
r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0;
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest);
Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
- oident ItemOrderRequest;
- ItemOrderRequest.proto = PROTO_Z3950;
- ItemOrderRequest.oclass = CLASS_EXTSERV;
- ItemOrderRequest.value = VAL_ITEMORDER;
- req->packageType = odr_oiddup(out,oid_getoidbyent(&ItemOrderRequest));
+ req->referenceId = set_refid (out);
+
+ req->packageType = odr_oiddup(out, yaz_oid_extserv_item_order);
req->packageName = esPackageName;
req->taskSpecificParameters = create_ItemOrderExternal(type, itemno);
return 0;
}
-static int only_z3950()
+static int only_z3950(void)
{
+ if (!conn)
+ {
+ printf ("Not connected yet\n");
+ return 1;
+ }
if (protocol == PROTO_HTTP)
{
- printf ("Not supported by SRW\n");
- return 1;
+ printf ("Not supported by SRW\n");
+ return 1;
}
return 0;
}
return cmd_update_common(arg, 0);
}
+static int cmd_update_Z3950(int version, int action_no, const char *recid,
+ char *rec_buf, int rec_len);
+
+static int cmd_update_SRW(int action_no, const char *recid,
+ char *rec_buf, int rec_len);
+
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;
- char action[20], recid[20], fname[80];
+ char action[20], recid_buf[20];
+ const char *recid = 0;
+ char *rec_buf;
+ int rec_len;
int action_no;
- Z_External *record_this = 0;
+ int noread = 0;
- if (only_z3950())
- return 0;
*action = 0;
- *recid = 0;
- *fname = 0;
- sscanf (arg, "%19s %19s %79s", action, recid, fname);
+ *recid_buf = 0;
+ sscanf (arg, "%19s %19s%n", action, recid_buf, &noread);
+ if (noread == 0)
+ {
+ printf("Use: update action recid [fname]\n");
+ printf(" where action is one of insert,replace,delete.update\n");
+ printf(" recid is some record ID. Use none for no ID\n");
+ printf(" fname is file of record to be updated\n");
+ return 0;
+ }
if (!strcmp (action, "insert"))
action_no = Z_IUOriginPartToKeep_recordInsert;
return 0;
}
- if (*fname)
- {
- FILE *inf;
- struct stat status;
- stat (fname, &status);
- if (S_ISREG(status.st_mode) && (inf = fopen(fname, "rb")))
- {
- size_t len = status.st_size;
- char *buf = (char *) xmalloc (len);
+ if (strcmp(recid_buf, "none")) /* none means no record ID */
+ recid = recid_buf;
- fread (buf, 1, len, inf);
+ arg += noread;
+ if (parse_cmd_doc(&arg, out, &rec_buf, &rec_len, 1) == 0)
+ return 0;
- fclose (inf);
-
- record_this = z_ext_record (out, VAL_TEXT_XML, buf, len);
-
- xfree (buf);
+#if YAZ_HAVE_XML2
+ if (protocol == PROTO_HTTP)
+ return cmd_update_SRW(action_no, recid, rec_buf, rec_len);
+#endif
+ return cmd_update_Z3950(version, action_no, recid, rec_buf, rec_len);
+}
+
+#if YAZ_HAVE_XML2
+static int cmd_update_SRW(int action_no, const char *recid,
+ char *rec_buf, int rec_len)
+{
+ if (!conn)
+ cmd_open(0);
+ if (!conn)
+ return 0;
+ else
+ {
+ Z_SRW_PDU *srw = yaz_srw_get(out, Z_SRW_update_request);
+ Z_SRW_updateRequest *sr = srw->u.update_request;
+
+ switch(action_no)
+ {
+ case Z_IUOriginPartToKeep_recordInsert:
+ sr->operation = "info:srw/action/1/create";
+ break;
+ case Z_IUOriginPartToKeep_recordReplace:
+ sr->operation = "info:srw/action/1/replace";
+ break;
+ case Z_IUOriginPartToKeep_recordDelete:
+ sr->operation = "info:srw/action/1/delete";
+ break;
}
- else
+ if (rec_buf)
{
- printf ("File %s doesn't exist\n", fname);
- return 0;
+ sr->record = yaz_srw_get_record(out);
+ sr->record->recordData_buf = rec_buf;
+ sr->record->recordData_len = rec_len;
+ sr->record->recordSchema = record_schema;
}
+ if (recid)
+ sr->recordId = odr_strdup(out, recid);
+ return send_srw(srw);
}
+}
+#endif
+
+static int cmd_update_Z3950(int version, int action_no, const char *recid,
+ char *rec_buf, int rec_len)
+{
+ Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest );
+ Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
+ Z_External *r;
+ Z_External *record_this = 0;
+ if (rec_buf)
+ record_this = z_ext_record_oid(out, yaz_oid_recsyn_xml,
+ rec_buf, rec_len);
else
{
if (!record_last)
record_this = record_last;
}
- req->packageType =
- yaz_oidval_to_z3950oid(out, CLASS_EXTSERV,
- version == 0 ? VAL_DBUPDATE0 : VAL_DBUPDATE);
+ req->packageType = odr_oiddup(out, (version == 0 ?
+ yaz_oid_extserv_database_update_first_version :
+ yaz_oid_extserv_database_update));
req->packageName = esPackageName;
r->descriptor = 0;
if (version == 0)
{
- Z_IU0OriginPartToKeep *toKeep;
- Z_IU0SuppliedRecords *notToKeep;
-
- r->which = Z_External_update0;
- r->u.update0 = (Z_IU0Update *) odr_malloc(out, sizeof(*r->u.update0));
- r->u.update0->which = Z_IUUpdate_esRequest;
- r->u.update0->u.esRequest = (Z_IU0UpdateEsRequest *)
- odr_malloc(out, sizeof(*r->u.update0->u.esRequest));
- toKeep = r->u.update0->u.esRequest->toKeep = (Z_IU0OriginPartToKeep *)
- odr_malloc(out, sizeof(*r->u.update0->u.esRequest->toKeep));
-
- toKeep->databaseName = databaseNames[0];
- toKeep->schema = 0;
- 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;
+ 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
{
- 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;
+ 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_xmles(const char *arg)
+{
+ if (only_z3950())
+ return 1;
+ else
+ {
+ char *asn_buf = 0;
+ int noread = 0;
+ Odr_oid *oid;
+ char oid_str[51];
+ Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest);
+ Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
+
+
+ Z_External *ext = (Z_External *) odr_malloc(out, sizeof(*ext));
+
+ req->referenceId = set_refid (out);
+ req->taskSpecificParameters = ext;
+ ext->indirect_reference = 0;
+ ext->descriptor = 0;
+ ext->which = Z_External_octet;
+ ext->u.single_ASN1_type = (Odr_oct *) odr_malloc (out, sizeof(Odr_oct));
+ sscanf(arg, "%50s%n", oid_str, &noread);
+ if (noread == 0)
+ {
+ printf("Missing OID for xmles\n");
+ return 0;
+ }
+ arg += noread;
+ if (parse_cmd_doc(&arg, out, &asn_buf,
+ &ext->u.single_ASN1_type->len, 0) == 0)
+ return 0;
+
+ ext->u.single_ASN1_type->buf = (unsigned char *) asn_buf;
+
+ oid = yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_EXTSERV, oid_str, out);
+ if (!oid)
+ {
+ printf("Bad OID: %s\n", oid_str);
+ return 0;
+ }
+
+ req->packageType = oid;
+
+ ext->direct_reference = oid;
+
+ send_apdu(apdu);
+
+ return 2;
+ }
+}
+
static int cmd_itemorder(const char *arg)
{
char type[12];
int itemno;
if (only_z3950())
- return 0;
+ return 1;
if (sscanf (arg, "%10s %d", type, &itemno) != 2)
return 0;
static int cmd_zversion(const char *arg)
{
if (*arg && arg)
- z3950_version = atoi(arg);
+ z3950_version = atoi(arg);
else
- printf ("version is %d\n", z3950_version);
+ printf ("version is %d\n", z3950_version);
return 0;
}
{
if (*arg)
{
- int r;
- int pos;
- r = yaz_init_opt_encode(&z3950_options, arg, &pos);
+ int r;
+ int pos;
+ r = yaz_init_opt_encode(&z3950_options, arg, &pos);
+ if (r == -1)
+ printf("Unknown option(s) near %s\n", arg+pos);
}
else
{
- yaz_init_opt_decode(&z3950_options, show_opt, 0);
- printf ("\n");
+ 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
+ return 0;
+#if YAZ_HAVE_XML2
if (!conn)
- cmd_open(0);
+ 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)
+ Z_SRW_PDU *sr = 0;
+
+ setno = 1;
+
+ /* save this for later .. when fetching individual records */
+ sr = yaz_srw_get(out, Z_SRW_explain_request);
+ if (recordsyntax_size == 1
+ && !yaz_matchstr(recordsyntax_list[0], "xml"))
sr->u.explain_request->recordPacking = "xml";
- send_srw(sr);
- return 2;
+ send_srw(sr);
+ return 2;
}
#endif
return 0;
strncpy (cur_host, arg, sizeof(cur_host)-1);
cur_host[sizeof(cur_host)-1] = 0;
}
- if (!conn || protocol != PROTO_Z3950)
- return 0;
+ if (only_z3950())
+ return 1;
send_initRequest(cur_host);
return 2;
}
+static int cmd_sru(const char *arg)
+{
+ if (!*arg)
+ {
+ printf("SRU method is: %s\n", sru_method);
+ }
+ else
+ {
+ if (!yaz_matchstr(arg, "post"))
+ sru_method = "post";
+ else if (!yaz_matchstr(arg, "get"))
+ sru_method = "get";
+ else if (!yaz_matchstr(arg, "soap"))
+ sru_method = "soap";
+ else
+ {
+ printf("Unknown SRU method: %s\n", arg);
+ printf("Specify one of POST, GET, SOAP\n");
+ }
+ }
+ return 0;
+}
+
static int cmd_find(const char *arg)
{
if (!*arg)
}
if (protocol == PROTO_HTTP)
{
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
if (!conn)
cmd_open(0);
- if (!conn)
- return 0;
+ if (!conn)
+ return 0;
if (!send_SRW_searchRequest(arg))
return 0;
#else
{
try_reconnect();
- if (!conn) {
+ if (!conn) {
printf("Not connected yet\n");
return 0;
}
static int cmd_delete(const char *arg)
{
- if (!conn)
- {
- printf("Not connected yet\n");
- return 0;
- }
if (only_z3950())
- return 0;
+ return 0;
if (!send_deleteResultSetRequest(arg))
return 0;
return 2;
static int cmd_lslb(const char *arg)
{
- if (only_z3950())
- return 0;
if (!(largeSetLowerBound = atoi(arg)))
return 0;
return 1;
static int cmd_mspn(const char *arg)
{
- if (only_z3950())
- return 0;
if (!(mediumSetPresentNumber = atoi(arg)))
return 0;
return 1;
*p = '\0';
}
if (*arg)
- *start = atoi(arg);
+ {
+ if (!strcmp(arg, "all"))
+ {
+ *number = last_hit_count;
+ *start = 1;
+ }
+ else
+ *start = atoi(arg);
+ }
if (p && (p=strchr(p+1, '+')))
strcpy (setstring, p+1);
else if (setnumber >= 0)
req->resultSetStartPoint = &setno;
req->numberOfRecordsRequested = &nos;
- req->preferredRecordSyntax =
- yaz_oidval_to_z3950oid(out, CLASS_RECSYN, recordsyntax);
+ if (recordsyntax_size)
+ req->preferredRecordSyntax =
+ yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_RECSYN, recordsyntax_list[0], out);
- if (record_schema)
+ if (record_schema || recordsyntax_size >= 2)
{
req->recordComposition = &compo;
compo.which = Z_RecordComp_complex;
compo.u.complex->generic = (Z_Specification *)
odr_malloc(out, sizeof(*compo.u.complex->generic));
+
compo.u.complex->generic->which = Z_Schema_oid;
-
- compo.u.complex->generic->schema.oid =
- yaz_str_to_z3950oid(out, CLASS_SCHEMA, record_schema);
-
- if (!compo.u.complex->generic->schema.oid)
+ if (!record_schema)
+ compo.u.complex->generic->schema.oid = 0;
+ else
{
- /* OID wasn't a schema! Try record syntax instead. */
- compo.u.complex->generic->schema.oid = (Odr_oid *)
- yaz_str_to_z3950oid(out, CLASS_RECSYN, record_schema);
+ compo.u.complex->generic->schema.oid =
+ yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_SCHEMA, record_schema, out);
+
+ if (!compo.u.complex->generic->schema.oid)
+ {
+ /* OID wasn't a schema! Try record syntax instead. */
+ compo.u.complex->generic->schema.oid = (Odr_oid *)
+ yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_RECSYN, record_schema, out);
+ }
}
if (!elementSetNames)
compo.u.complex->generic->elementSpec = 0;
}
compo.u.complex->num_dbSpecific = 0;
compo.u.complex->dbSpecific = 0;
+
compo.u.complex->num_recordSyntax = 0;
compo.u.complex->recordSyntax = 0;
+ if (recordsyntax_size >= 2)
+ {
+ int i;
+ compo.u.complex->num_recordSyntax = recordsyntax_size;
+ compo.u.complex->recordSyntax = (Odr_oid **)
+ odr_malloc(out, recordsyntax_size * sizeof(Odr_oid*));
+ for (i = 0; i < recordsyntax_size; i++)
+ compo.u.complex->recordSyntax[i] =
+ yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_RECSYN, recordsyntax_list[i], out);
+ }
}
else if (elementSetNames)
{
return 2;
}
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
static int send_SRW_presentRequest(const char *arg)
{
char setstring[100];
sr->u.request->maximumRecords = odr_intdup(out, nos);
if (record_schema)
sr->u.request->recordSchema = record_schema;
- if (recordsyntax == VAL_TEXT_XML)
+ if (recordsyntax_size == 1 && !yaz_matchstr(recordsyntax_list[0], "xml"))
sr->u.request->recordPacking = "xml";
return send_srw(sr);
}
if (conn)
cs_close (conn);
conn = 0;
- if (session_mem)
- {
- nmem_destroy (session_mem);
- session_mem = NULL;
- }
sent_close = 0;
odr_reset(out);
odr_reset(in);
odr_reset(print);
+ last_hit_count = 0;
}
void process_close(Z_Close *req)
{
if (protocol == PROTO_HTTP)
{
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
if (!conn)
cmd_open(0);
- if (!conn)
- return 0;
+ if (!conn)
+ return 0;
if (!send_SRW_presentRequest(arg))
return 0;
#else
return 2;
}
+void exit_client(int code)
+{
+ file_history_save(file_history);
+ file_history_destroy(&file_history);
+ exit(code);
+}
+
int cmd_quit(const char *arg)
{
printf("See you later, alligator.\n");
xmalloc_trav ("");
- exit(0);
+ exit_client(0);
return 0;
}
Z_TriggerResourceControlRequest *req =
apdu->u.triggerResourceControlRequest;
bool_t rfalse = 0;
-
- if (!conn)
- {
- printf("Session not initialized yet\n");
- return 0;
- }
+ char command[16];
+
+ *command = '\0';
+ sscanf(arg, "%15s", command);
+
if (only_z3950())
- return 0;
- if (!ODR_MASK_GET(session->options, Z_Options_triggerResourceCtrl))
+ return 0;
+ if (session_initResponse &&
+ !ODR_MASK_GET(session_initResponse->options,
+ Z_Options_triggerResourceCtrl))
{
printf("Target doesn't support cancel (trigger resource ctrl)\n");
return 0;
send_apdu(apdu);
printf("Sent cancel request\n");
- return 2;
+ if (!strcmp(command, "wait"))
+ return 2;
+ return 1;
}
int fres;
fres=cmd_find(arg);
if( fres > 0 ) {
- return cmd_cancel("");
+ return cmd_cancel("");
};
return fres;
}
-int send_scanrequest(const char *query, int pp, int num, const char *term)
+int send_scanrequest(const char *set, const char *query,
+ int pp, int num, const char *term)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_scanRequest);
Z_ScanRequest *req = apdu->u.scanRequest;
if (only_z3950())
- return 0;
+ return 0;
if (queryType == QueryType_CCL2RPN)
{
int error, pos;
return -1;
}
req->attributeSet =
- yaz_oidval_to_z3950oid(out, CLASS_ATTSET, VAL_BIB1);
+ yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_ATTSET, "Bib-1", out);
if (!(req->termListAndStartPoint = ccl_scan_query (out, rpn)))
{
printf("Couldn't convert CCL to Scan term\n");
const char *pqf_msg;
size_t off;
int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off);
- printf("%*s^\n", off+7, "");
+ int ioff = off;
+ printf("%*s^\n", ioff+7, "");
printf("Prefix query error: %s (code %d)\n", pqf_msg, code);
yaz_pqf_destroy (pqf_parser);
return -1;
}
yaz_pqf_destroy (pqf_parser);
}
+ if (queryCharset && outputCharset)
+ {
+ yaz_iconv_t cd = yaz_iconv_open(queryCharset, outputCharset);
+ if (!cd)
+ {
+ printf("Conversion from %s to %s unsupported\n",
+ outputCharset, queryCharset);
+ return -1;
+ }
+ yaz_query_charset_convert_apt(req->termListAndStartPoint, out, cd);
+ yaz_iconv_close(cd);
+ }
if (term && *term)
{
if (req->termListAndStartPoint->term &&
req->numberOfTermsRequested = #
req->preferredPositionInResponse = &pp;
req->stepSize = odr_intdup(out, scan_stepSize);
+
+ if (set)
+ yaz_oi_set_string_oid(&req->otherInfo, out,
+ yaz_oid_userinfo_scan_set, 1, set);
+
send_apdu(apdu);
return 2;
}
char setstring[32];
if (only_z3950())
- return 0;
+ return 0;
if (setnumber >= 0)
sprintf (setstring, "%d", setnumber);
else
if (t->displayTerm)
printf("%s", t->displayTerm);
else if (t->term->which == Z_Term_general)
- {
printf("%.*s", t->term->u.general->len, t->term->u.general->buf);
- sprintf(last_scan_line, "%.*s", t->term->u.general->len,
- t->term->u.general->buf);
- }
else
printf("Term (not general)");
+ if (t->term->which == Z_Term_general)
+ sprintf(last_scan_line, "%.*s", t->term->u.general->len,
+ t->term->u.general->buf);
+
if (t->globalOccurrences)
printf (" (%d)\n", *t->globalOccurrences);
else
int cmd_sort_generic(const char *arg, int newset)
{
- if (!conn)
- {
- printf("Session not initialized yet\n");
- return 0;
- }
if (only_z3950())
- return 0;
- if (!ODR_MASK_GET(session->options, Z_Options_sort))
+ return 0;
+ if (session_initResponse &&
+ !ODR_MASK_GET(session_initResponse->options, Z_Options_sort))
{
printf("Target doesn't support sort\n");
return 0;
return 0;
}
-int cmd_scan(const char *arg)
+static int cmd_scan_common(const char *set, const char *arg)
{
if (protocol == PROTO_HTTP)
{
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
if (!conn)
cmd_open(0);
- if (!conn)
- return 0;
- if (*arg)
- {
- if (send_SRW_scanRequest(arg, scan_position, scan_size) < 0)
- return 0;
- }
- else
- {
- if (send_SRW_scanRequest(last_scan_line, 1, scan_size) < 0)
- return 0;
- }
- return 2;
+ if (!conn)
+ return 0;
+ if (*arg)
+ {
+ if (send_SRW_scanRequest(arg, scan_position, scan_size) < 0)
+ return 0;
+ }
+ else
+ {
+ if (send_SRW_scanRequest(last_scan_line, 1, scan_size) < 0)
+ return 0;
+ }
+ return 2;
#else
return 0;
#endif
}
else
{
- if (!conn)
- {
- try_reconnect();
-
- if (!conn) {
- printf("Session not initialized yet\n");
- return 0;
- }
- }
- if (!ODR_MASK_GET(session->options, Z_Options_scan))
- {
- printf("Target doesn't support scan\n");
- return 0;
- }
- if (*arg)
- {
- strcpy (last_scan_query, arg);
- if (send_scanrequest(arg, scan_position, scan_size, 0) < 0)
- return 0;
- }
- else
- {
- if (send_scanrequest(last_scan_query, 1, scan_size, last_scan_line) < 0)
- return 0;
- }
- return 2;
+ if (!conn)
+ {
+ try_reconnect();
+
+ if (!conn) {
+ printf("Session not initialized yet\n");
+ return 0;
+ }
+ }
+ if (session_initResponse &&
+ !ODR_MASK_GET(session_initResponse->options, Z_Options_scan))
+ {
+ printf("Target doesn't support scan\n");
+ return 0;
+ }
+ if (*arg)
+ {
+ strcpy (last_scan_query, arg);
+ if (send_scanrequest(set, arg,
+ scan_position, scan_size, 0) < 0)
+ return 0;
+ }
+ else
+ {
+ if (send_scanrequest(set, last_scan_query,
+ 1, scan_size, last_scan_line) < 0)
+ return 0;
+ }
+ return 2;
}
}
+int cmd_scan(const char *arg)
+{
+ return cmd_scan_common(0, arg);
+}
+
+int cmd_setscan(const char *arg)
+{
+ char setstring[100];
+ int nor;
+ if (sscanf(arg, "%99s%n", setstring, &nor) < 1)
+ {
+ printf("missing set for setscan\n");
+ return 0;
+ }
+ return cmd_scan_common(setstring, arg + nor);
+}
+
int cmd_schema(const char *arg)
{
xfree(record_schema);
int cmd_format(const char *arg)
{
- oid_value nsyntax;
+ const char *cp = arg;
+ int nor;
+ int idx = 0;
+ int i;
+ char form_str[41];
if (!arg || !*arg)
{
printf("Usage: format <recordsyntax>\n");
return 0;
}
- nsyntax = oid_getvalbyname (arg);
- if (strcmp(arg, "none") && nsyntax == VAL_NONE)
+ for (i = 0; i < recordsyntax_size; i++)
{
- printf ("unknown record syntax\n");
- return 0;
+ xfree(recordsyntax_list[i]);
+ recordsyntax_list[i] = 0;
}
- recordsyntax = nsyntax;
+
+ while (sscanf(cp, "%40s%n", form_str, &nor) >= 1 && nor > 0
+ && idx < RECORDSYNTAX_MAX)
+ {
+ if (!strcmp(form_str, "none"))
+ break;
+ recordsyntax_list[idx] = xstrdup(form_str);
+ cp += nor;
+ idx++;
+ }
+ recordsyntax_size = idx;
return 1;
}
return 1;
}
-int cmd_attributeset(const char *arg)
-{
- char what[100];
-
- if (!arg || !*arg)
- {
- printf("Usage: attributeset <setname>\n");
- return 0;
- }
- sscanf(arg, "%s", what);
- if (p_query_attset (what))
- {
- printf("Unknown attribute set name\n");
- return 0;
- }
- return 1;
-}
-
int cmd_querytype (const char *arg)
{
if (!strcmp (arg, "ccl"))
{
Z_APDU *apdu;
Z_Close *req;
- if (!conn)
- return 0;
if (only_z3950())
- return 0;
-
+ return 0;
apdu = zget_APDU(out, Z_APDU_close);
req = apdu->u.close;
*req->closeReason = Z_Close_finished;
int cmd_proxy(const char* arg)
{
- xfree (yazProxy);
- yazProxy = NULL;
+ xfree(yazProxy);
+ yazProxy = 0;
if (*arg)
yazProxy = xstrdup (arg);
return 1;
*l1 = 0;
if (sscanf(arg, "%29s", l1) < 1)
{
- printf("MARC character set is `%s'\n",
+ printf("MARC character set is `%s'\n",
marcCharset ? marcCharset: "none");
return 1;
}
xfree (marcCharset);
marcCharset = 0;
- if (strcmp(l1, "-"))
+ if (strcmp(l1, "-") && strcmp(l1, "none"))
marcCharset = xstrdup(l1);
return 1;
}
+int cmd_querycharset(const char *arg)
+{
+ char l1[30];
+
+ *l1 = 0;
+ if (sscanf(arg, "%29s", l1) < 1)
+ {
+ printf("Query character set is `%s'\n",
+ queryCharset ? queryCharset: "none");
+ return 1;
+ }
+ xfree (queryCharset);
+ queryCharset = 0;
+ if (strcmp(l1, "-") && strcmp(l1, "none"))
+ queryCharset = xstrdup(l1);
+ return 1;
+}
+
int cmd_displaycharset(const char *arg)
{
char l1[30];
*l1 = 0;
if (sscanf(arg, "%29s", l1) < 1)
{
- printf("Display character set is `%s'\n",
+ printf("Display character set is `%s'\n",
outputCharset ? outputCharset: "none");
}
else
*l1 = 0;
if (sscanf(arg, "%29s %d %d", l1, &negotiationCharsetRecords,
- &negotiationCharsetVersion) < 1)
+ &negotiationCharsetVersion) < 1)
{
- printf("Current negotiation character set is `%s'\n",
+ printf("Negotiation character set `%s'\n",
negotiationCharset ? negotiationCharset: "none");
- printf("Records in charset %s\n", negotiationCharsetRecords ?
- "yes" : "no");
- printf("Charneg version %d\n", negotiationCharsetVersion);
+ if (negotiationCharset)
+ {
+ printf("Records in charset %s\n", negotiationCharsetRecords ?
+ "yes" : "no");
+ printf("Charneg version %d\n", negotiationCharsetVersion);
+ }
}
else
{
- xfree (negotiationCharset);
- negotiationCharset = NULL;
- if (*l1 && strcmp(l1, "-") && strcmp(l1, "none"))
- {
- negotiationCharset = xstrdup(l1);
- printf ("Character set negotiation : %s\n", negotiationCharset);
- }
+ xfree (negotiationCharset);
+ negotiationCharset = NULL;
+ if (*l1 && strcmp(l1, "-") && strcmp(l1, "none"))
+ {
+ negotiationCharset = xstrdup(l1);
+ printf ("Character set negotiation : %s\n", negotiationCharset);
+ }
}
return 1;
}
int cmd_charset(const char* arg)
{
- char l1[30], l2[30], l3[30];
+ char l1[30], l2[30], l3[30], l4[30];
- *l1 = *l2 = *l3 = 0;
- if (sscanf(arg, "%29s %29s %29s", l1, l2, l3) < 1)
+ *l1 = *l2 = *l3 = *l4 = '\0';
+ if (sscanf(arg, "%29s %29s %29s %29s", l1, l2, l3, l4) < 1)
{
- cmd_negcharset("");
- cmd_displaycharset("");
- cmd_marccharset("");
+ cmd_negcharset("");
+ cmd_displaycharset("");
+ cmd_marccharset("");
+ cmd_querycharset("");
}
else
{
- cmd_negcharset(l1);
- if (*l2)
- cmd_displaycharset(l2);
- if (*l3)
- cmd_marccharset(l3);
+ cmd_negcharset(l1);
+ if (*l2)
+ cmd_displaycharset(l2);
+ if (*l3)
+ cmd_marccharset(l3);
+ if (*l4)
+ cmd_querycharset(l4);
}
return 1;
}
int cmd_lang(const char* arg)
{
if (*arg == '\0') {
- printf("Current language is `%s'\n", (yazLang)?yazLang:NULL);
- return 1;
+ printf("Current language is `%s'\n", yazLang ? yazLang : "none");
+ return 1;
}
xfree (yazLang);
yazLang = NULL;
if ((cp = strrchr (line, '\n')))
*cp = '\0';
-
- if( echo ) {
- printf( "processing line: %s\n",line );
- };
+
+ if( echo ) {
+ printf( "processing line: %s\n",line );
+ };
process_cmd_line(line);
}
if ((newcqltrans = cql_transform_open_fname(arg)) == 0) {
perror("unable to open CQL file");
- return 0;
+ return 0;
}
if (cqltrans != 0)
- cql_transform_close(cqltrans);
+ cql_transform_close(cqltrans);
cqltrans = newcqltrans;
strcpy(cql_fields, arg);
} else if(strcmp(arg,"on")==0) {
auto_reconnect = 1;
} else if(strcmp(arg,"off")==0) {
- auto_reconnect = 0;
+ auto_reconnect = 0;
} else {
printf("Error use on or off\n");
return 1;
return 0;
}
+
+int cmd_set_auto_wait(const char* arg)
+{
+ if(strlen(arg)==0) {
+ auto_wait = ! auto_wait;
+ } else if(strcmp(arg,"on")==0) {
+ auto_wait = 1;
+ } else if(strcmp(arg,"off")==0) {
+ auto_wait = 0;
+ } else {
+ printf("Error use on or off\n");
+ return 1;
+ }
+
+ if (auto_wait)
+ printf("Set auto wait enabled.\n");
+ else
+ printf("Set auto wait disabled.\n");
+
+ return 0;
+}
+
int cmd_set_marcdump(const char* arg)
{
if(marc_file && marc_file != stderr) { /* don't close stdout*/
{0,(enum oid_class) 0}
};
char oname_str[101], oclass_str[101], oid_str[101];
- char* name;
int i;
oid_class oidclass = CLASS_GENERAL;
- int val = 0, oid[OID_SIZE];
- struct oident * new_oident=NULL;
-
+ Odr_oid oid[OID_SIZE];
+
if (sscanf (args, "%100[^ ] %100[^ ] %100s",
oname_str,oclass_str, oid_str) < 1) {
printf("Error in register command \n");
return 0;
}
- i = 0;
- name = oid_str;
- val = 0;
-
- while (isdigit (*(unsigned char *) name))
- {
- val = val*10 + (*name - '0');
- name++;
- if (*name == '.')
- {
- if (i < OID_SIZE-1)
- oid[i++] = val;
- val = 0;
- name++;
- }
- }
- oid[i] = val;
- oid[i+1] = -1;
-
- new_oident = oid_addent (oid, PROTO_GENERAL, oidclass, oname_str,
- VAL_DYNAMIC);
- if(strcmp(new_oident->desc,oname_str))
+ oid_dotstring_to_oid(oid_str, oid);
+
+ if (yaz_oid_add(yaz_oid_std(), oidclass, oname_str, oid))
{
- fprintf(stderr,"oid is already named as %s, registration failed\n",
- new_oident->desc);
+ printf("oid %s already exists, registration failed\n",
+ oname_str);
}
return 1;
}
return 1;
}
-void source_rcfile()
+void source_rc_file(const char *rc_file)
{
- /* Look for a $HOME/.yazclientrc and source it if it exists */
+ /* If rc_file != NULL, source that. Else
+ Look for .yazclientrc and read it if it exists.
+ If it does not exist, read $HOME/.yazclientrc instead */
struct stat statbuf;
- char buffer[1000];
- char* homedir=getenv("HOME");
-
- if( homedir ) {
-
- sprintf(buffer,"%s/.yazclientrc",homedir);
- if(stat(buffer,&statbuf)==0) {
- cmd_source(buffer, 0 );
- }
-
- };
-
- if(stat(".yazclientrc",&statbuf)==0) {
- cmd_source(".yazclientrc", 0 );
+ if (rc_file)
+ {
+ if (stat(rc_file, &statbuf) == 0)
+ cmd_source(rc_file, 0);
+ else
+ {
+ fprintf(stderr, "yaz_client: cannot source '%s'\n", rc_file);
+ exit(1);
+ }
+ }
+ else
+ {
+ char fname[1000];
+ strcpy(fname, ".yazclientrc");
+ if (stat(fname, &statbuf)==0)
+ {
+ cmd_source(fname, 0);
+ }
+ else
+ {
+ const char* homedir = getenv("HOME");
+ if (homedir)
+ {
+ sprintf(fname, "%.800s/%s", homedir, ".yazclientrc");
+ if (stat(fname, &statbuf)==0)
+ cmd_source(fname, 0);
+ }
+ }
}
}
+void add_to_readline_history(void *client_data, const char *line)
+{
+#if HAVE_READLINE_HISTORY_H
+ if (strlen(line))
+ add_history(line);
+#endif
+}
-static void initialize(void)
+static void initialize(const char *rc_file)
{
FILE *inf;
int i;
fprintf(stderr, "failed to allocate ODR streams\n");
exit(1);
}
- oid_init();
setvbuf(stdout, 0, _IONBF, 0);
if (apdu_file)
/* If this fails, no problem: we detect cqltrans == 0 later */
#if HAVE_READLINE_READLINE_H
- rl_attempted_completion_function = (CPPFunction*)readline_completer;
+ rl_attempted_completion_function =
+ (char **(*)(const char *, int, int)) readline_completer;
#endif
-
-
- for(i=0; i<maxOtherInfosSupported; ++i) {
- extraOtherInfos[i].oidval = -1;
+ for(i = 0; i < maxOtherInfosSupported; ++i) {
+ extraOtherInfos[i].oid[0] = -1;
+ extraOtherInfos[i].value = 0;
}
+
+ cmd_format("usmarc");
- source_rcfile();
+ source_rc_file(rc_file);
+
+ file_history = file_history_new();
+ file_history_load(file_history);
+ file_history_trav(file_history, 0, add_to_readline_history);
}
#if HAVE_GETTIMEOFDAY
-struct timeval tv_start, tv_end;
+struct timeval tv_start;
#endif
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
static void handle_srw_record(Z_SRW_record *rec)
{
if (rec->recordPosition)
{
- printf ("pos=%d", *rec->recordPosition);
- setno = *rec->recordPosition + 1;
+ printf ("pos=%d", *rec->recordPosition);
+ setno = *rec->recordPosition + 1;
}
if (rec->recordSchema)
- printf (" schema=%s", 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);
- if (marc_file)
- fwrite (rec->recordData_buf, 1, rec->recordData_len, marc_file);
+ fwrite(rec->recordData_buf, 1, rec->recordData_len, stdout);
+ if (marc_file)
+ fwrite (rec->recordData_buf, 1, rec->recordData_len, marc_file);
}
else
- printf ("No data!");
+ printf ("No data!");
printf("\n");
}
for (i = 0; i<res->num_diagnostics; i++)
{
- if (res->diagnostics[i].uri)
- printf ("SRW diagnostic %s\n",
- res->diagnostics[i].uri);
- else
- printf ("SRW diagnostic missing or could not be decoded\n");
- if (res->diagnostics[i].message)
+ 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)
+ 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++)
- handle_srw_record(res->records + i);
+ handle_srw_record(res->records + i);
}
static void handle_srw_scan_term(Z_SRW_scanTerm *term)
{
if (term->displayTerm)
- printf("%s:", term->displayTerm);
+ printf("%s:", term->displayTerm);
else if (term->value)
- printf("%s:", term->value);
+ printf("%s:", term->value);
else
- printf("No value:");
+ printf("No value:");
if (term->numberOfRecords)
- printf(" %d", *term->numberOfRecords);
+ printf(" %d", *term->numberOfRecords);
if (term->whereInList)
- printf(" %s", term->whereInList);
+ printf(" %s", term->whereInList);
if (term->value && term->displayTerm)
- printf(" %s", term->value);
+ printf(" %s", term->value);
strcpy(last_scan_line, term->value);
printf("\n");
for (i = 0; i<res->num_diagnostics; i++)
{
- if (res->diagnostics[i].uri)
- printf ("SRW diagnostic %s\n",
- res->diagnostics[i].uri);
- else
- printf ("SRW diagnostic missing or could not be decoded\n");
- if (res->diagnostics[i].message)
+ 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)
+ if (res->diagnostics[i].details)
printf ("Details: %s\n", res->diagnostics[i].details);
}
if (res->terms)
- for (i = 0; i<res->num_terms; i++)
- handle_srw_scan_term(res->terms + i);
+ for (i = 0; i<res->num_terms; i++)
+ handle_srw_scan_term(res->terms + i);
}
static void http_response(Z_HTTP_Response *hres)
{
int ret = -1;
- const char *content_type = z_HTTP_header_lookup(hres->headers,
- "Content-Type");
const char *connection_head = z_HTTP_header_lookup(hres->headers,
"Connection");
- if (content_type && !yaz_strcmp_del("text/xml", content_type, "; "))
+ if (!yaz_srw_check_content_type(hres))
+ printf("Content type does not appear to be XML\n");
+ else
{
Z_SOAP *soap_package = 0;
ODR o = odr_createmem(ODR_DECODE);
- Z_SOAP_Handler soap_handlers[2] = {
- {"http://www.loc.gov/zing/srw/", 0,
- (Z_SOAP_fun) yaz_srw_codec},
+ Z_SOAP_Handler soap_handlers[3] = {
+ {YAZ_XMLNS_SRU_v1_1, 0, (Z_SOAP_fun) yaz_srw_codec},
+ {YAZ_XMLNS_UPDATE_v0_9, 0, (Z_SOAP_fun) yaz_ucp_codec},
{0, 0, 0}
};
ret = z_soap_codec(o, &soap_package,
&hres->content_buf, &hres->content_len,
soap_handlers);
- if (!ret && soap_package->which == Z_SOAP_generic &&
- soap_package->u.generic->no == 0)
+ if (!ret && soap_package->which == Z_SOAP_generic)
{
- Z_SRW_PDU *sr = soap_package->u.generic->p;
+ Z_SRW_PDU *sr = (Z_SRW_PDU *) soap_package->u.generic->p;
if (sr->which == Z_SRW_searchRetrieve_response)
handle_srw_response(sr->u.response);
else if (sr->which == Z_SRW_explain_response)
handle_srw_explain_response(sr->u.explain_response);
else if (sr->which == Z_SRW_scan_response)
handle_srw_scan_response(sr->u.scan_response);
+ else if (sr->which == Z_SRW_update_response)
+ printf("Got update response. Status: %s\n",
+ sr->u.update_response->operationStatus);
else
ret = -1;
}
else if (soap_package && (soap_package->which == Z_SOAP_fault
- || soap_package->which == Z_SOAP_error))
+ || soap_package->which == Z_SOAP_error))
{
printf ("HTTP Error Status=%d\n", hres->code);
printf ("SOAP Fault code %s\n",
soap_package->u.fault->fault_code);
printf ("SOAP Fault string %s\n",
soap_package->u.fault->fault_string);
- if (soap_package->u.fault->details)
- printf ("SOAP Details %s\n",
- soap_package->u.fault->details);
+ if (soap_package->u.fault->details)
+ printf ("SOAP Details %s\n",
+ soap_package->u.fault->details);
}
else
+ {
+ printf("z_soap_codec failed. (no SOAP error)\n");
ret = -1;
+ }
odr_destroy(o);
}
if (ret)
{
if (hres->code != 200)
{
- printf ("HTTP Error Status=%d\n", hres->code);
+ printf ("HTTP Error Status=%d\n", hres->code);
}
else
{
}
else
{
- if (!strcmp(hres->version, "1.0"))
- {
- /* HTTP 1.0: only if Keep-Alive we stay alive.. */
- if (!connection_head || strcmp(connection_head, "Keep-Alive"))
- close_session();
- }
- else
- {
- /* HTTP 1.1: only if no close we stay alive .. */
- if (connection_head && !strcmp(connection_head, "close"))
- close_session();
- }
+ 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
-void wait_and_handle_response()
+void wait_and_handle_response(int one_response_only)
{
int reconnect_ok = 1;
int res;
char *netbuffer= 0;
int netbufferlen = 0;
+#if HAVE_GETTIMEOFDAY
+ int got_tv_end = 0;
+ struct timeval tv_end;
+#endif
Z_GDU *gdu;
while(conn)
buf_out = odr_getbuf(out, &len_out, 0);
- do_hex_dump(buf_out, len_out);
+ do_hex_dump(buf_out, len_out);
cs_put(conn, buf_out, len_out);
close_session();
break;
}
+#if HAVE_GETTIMEOFDAY
+ if (got_tv_end == 0)
+ gettimeofday (&tv_end, 0); /* count first one only */
+ got_tv_end++;
+#endif
odr_reset(out);
odr_reset(in); /* release APDU from last round */
record_last = 0;
{
FILE *f = ber_file ? ber_file : stdout;
odr_perror(in, "Decoding incoming APDU");
- fprintf(f, "[Near %d]\n", odr_offset(in));
+ fprintf(f, "[Near %ld]\n", (long) odr_offset(in));
fprintf(f, "Packet dump:\n---------\n");
odr_dumpBER(f, netbuffer, res);
fprintf(f, "---------\n");
if (apdu_file)
- {
+ {
z_GDU(print, &gdu, 0, 0);
- odr_reset(print);
- }
+ odr_reset(print);
+ }
if (conn && cs_more(conn))
continue;
- break;
+ break;
}
if (ber_file)
odr_dumpBER(ber_file, netbuffer, res);
close_session ();
}
}
-#if HAVE_XML2
+#if YAZ_HAVE_XML2
else if (gdu->which == Z_GDU_HTTP_Response)
{
http_response(gdu->u.HTTP_Response);
}
#endif
+ if (one_response_only)
+ break;
if (conn && !cs_more(conn))
break;
}
- if (conn)
- {
#if HAVE_GETTIMEOFDAY
- gettimeofday (&tv_end, 0);
+ if (got_tv_end)
+ {
#if 0
printf ("S/U S/U=%ld/%ld %ld/%ld",
(long) tv_start.tv_sec,
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
}
+#endif
xfree (netbuffer);
}
rpn = ccl_find_str (bibset, arg, &error, &pos);
if (error) {
- printf ("%*s^ - ", 3+strlen(last_cmd)+1+pos, " ");
+ int ioff = 3+strlen(last_cmd)+1+pos;
+ printf ("%*s^ - ", ioff, " ");
printf ("%s\n", ccl_err_msg (error));
}
else
{
if (rpn)
- {
+ {
ccl_pr_tree(rpn, stdout);
}
}
char oidstr[101], otherinfoString[101];
int otherinfoNo;
int sscan_res;
- int oidval;
- sscan_res = sscanf (args, "%d %100[^ ] %100s", &otherinfoNo, oidstr, otherinfoString);
- if (sscan_res==1) {
+ sscan_res = sscanf (args, "%d %100[^ ] %100s",
+ &otherinfoNo, oidstr, otherinfoString);
+
+ if (sscan_res > 0 && otherinfoNo >= maxOtherInfosSupported) {
+ printf("Error otherinfo index too large (%d>=%d)\n",
+ otherinfoNo,maxOtherInfosSupported);
+ return 0;
+ }
+
+
+ if (sscan_res==1)
+ {
/* reset this otherinfo */
- if(otherinfoNo>=maxOtherInfosSupported) {
- printf("Error otherinfo index to large (%d>%d)\n",
- otherinfoNo,maxOtherInfosSupported);
- }
- extraOtherInfos[otherinfoNo].oidval = -1;
- if (extraOtherInfos[otherinfoNo].value)
- free(extraOtherInfos[otherinfoNo].value);
+ extraOtherInfos[otherinfoNo].oid[0] = -1;
+ xfree(extraOtherInfos[otherinfoNo].value);
+ extraOtherInfos[otherinfoNo].value = 0;
return 0;
}
- if (sscan_res<3) {
+ if (sscan_res != 3) {
printf("Error in set_otherinfo command \n");
return 0;
}
-
- if (otherinfoNo>=maxOtherInfosSupported) {
- printf("Error otherinfo index to large (%d>%d)\n",
- otherinfoNo,maxOtherInfosSupported);
- }
-
- oidval = oid_getvalbyname (oidstr);
- if (oidval == -1 ) {
- printf("Error in set_otherinfo command unknown oid %s \n",oidstr);
- return 0;
+ else
+ {
+ NMEM oid_tmp = nmem_create();
+ const Odr_oid *oid =
+ yaz_string_to_oid_nmem(yaz_oid_std(),
+ CLASS_GENERAL, oidstr, oid_tmp);
+ oid_oidcpy(extraOtherInfos[otherinfoNo].oid, oid);
+
+ xfree(extraOtherInfos[otherinfoNo].value);
+ extraOtherInfos[otherinfoNo].value = xstrdup(otherinfoString);
+
+ nmem_destroy(oid_tmp);
}
- extraOtherInfos[otherinfoNo].oidval = oidval;
- if(extraOtherInfos[otherinfoNo].value) free(extraOtherInfos[otherinfoNo].value);
- extraOtherInfos[otherinfoNo].value = strdup(otherinfoString);
return 0;
}
int sec=atoi(args);
if( sec > 0 ) {
#ifdef WIN32
- Sleep(sec*1000);
+ Sleep(sec*1000);
#else
- sleep(sec);
+ sleep(sec);
#endif
- printf("Done sleeping %d seconds\n", sec);
+ printf("Done sleeping %d seconds\n", sec);
}
return 1;
}
int cmd_list_otherinfo(const char* args)
{
- int i;
+ int i;
- if(strlen(args)>0) {
+ if (strlen(args)>0)
+ {
i = atoi(args);
- if( i >= maxOtherInfosSupported ) {
+ if (i >= maxOtherInfosSupported)
+ {
printf("Error otherinfo index to large (%d>%d)\n",i,maxOtherInfosSupported);
return 0;
}
-
- if(extraOtherInfos[i].oidval != -1)
+ if (extraOtherInfos[i].value)
+ {
+ char name_oid[OID_STR_MAX];
+ oid_class oclass;
+ const char *name =
+ yaz_oid_to_string_buf(extraOtherInfos[i].oid, &oclass,
+ name_oid);
printf(" otherinfo %d %s %s\n",
- i,
- yaz_z3950_oid_value_to_str(
- (enum oid_value) extraOtherInfos[i].oidval,
- CLASS_RECSYN),
+ i, name ? name : "null",
extraOtherInfos[i].value);
+ }
- } else {
- for(i=0; i<maxOtherInfosSupported; ++i) {
- if(extraOtherInfos[i].oidval != -1)
+ }
+ else
+ {
+ for(i = 0; i < maxOtherInfosSupported; ++i)
+ {
+ if (extraOtherInfos[i].value)
+ {
+ char name_oid[OID_STR_MAX];
+ oid_class oclass;
+ const char *name =
+ yaz_oid_to_string_buf(extraOtherInfos[i].oid, &oclass,
+ name_oid);
printf(" otherinfo %d %s %s\n",
- i,
- yaz_z3950_oid_value_to_str(
- (enum oid_value) extraOtherInfos[i].oidval,
- CLASS_RECSYN),
+ i, name ? name : "null",
extraOtherInfos[i].value);
+ }
}
-
}
return 0;
}
printf("Not connected : \n");
}
- if(yazProxy) printf("using proxy : %s\n",yazProxy);
+ if(yazProxy) printf("using proxy : %s\n",yazProxy);
printf("auto_reconnect : %s\n",auto_reconnect?"on":"off");
+ printf("auto_wait : %s\n",auto_wait?"on":"off");
if (!auth) {
printf("Authentication : none\n");
printf(" Password : %s\n",auth->u.idPass->password?auth->u.idPass->password:"");
break;
case Z_IdAuthentication_open:
- printf("Authentication : psOpen\n");
- printf(" Open string : %s\n",auth->u.open);
+ printf("Authentication : psOpen\n");
+ printf(" Open string : %s\n",auth->u.open);
break;
default:
printf("Authentication : Unknown\n");
printf("ssub/lslb/mspn : %d/%d/%d\n",smallSetUpperBound,largeSetLowerBound,mediumSetPresentNumber);
/* print present related options */
- printf("Format : %s\n",yaz_z3950_oid_value_to_str(recordsyntax,CLASS_RECSYN));
+ if (recordsyntax_size > 0)
+ {
+ printf("Format : %s\n", recordsyntax_list[0]);
+ }
printf("Schema : %s\n",record_schema ? record_schema : "not set");
printf("Elements : %s\n",elementSetNames?elementSetNames->u.generic:"");
int cmd_clear_otherinfo(const char* args)
{
if(strlen(args)>0) {
- int otherinfoNo;
- otherinfoNo = atoi(args);
- if( otherinfoNo >= maxOtherInfosSupported ) {
- printf("Error otherinfo index to large (%d>%d)\n",otherinfoNo,maxOtherInfosSupported);
+ int otherinfoNo = atoi(args);
+ if (otherinfoNo >= maxOtherInfosSupported) {
+ printf("Error otherinfo index too large (%d>=%d)\n",
+ otherinfoNo, maxOtherInfosSupported);
return 0;
}
-
- if(extraOtherInfos[otherinfoNo].oidval != -1) {
+ if (extraOtherInfos[otherinfoNo].value)
+ {
/* only clear if set. */
- extraOtherInfos[otherinfoNo].oidval=-1;
- free(extraOtherInfos[otherinfoNo].value);
+ extraOtherInfos[otherinfoNo].oid[0] = -1;
+ xfree(extraOtherInfos[otherinfoNo].value);
+ extraOtherInfos[otherinfoNo].value = 0;
}
} else {
int i;
-
- for(i=0; i<maxOtherInfosSupported; ++i) {
- if (extraOtherInfos[i].oidval!=-1 ) {
- extraOtherInfos[i].oidval=-1;
- free(extraOtherInfos[i].value);
+ for(i = 0; i < maxOtherInfosSupported; ++i)
+ {
+ if (extraOtherInfos[i].value)
+ {
+ extraOtherInfos[i].oid[0] = -1;
+ xfree(extraOtherInfos[i].value);
+ extraOtherInfos[i].value = 0;
}
}
}
return 0;
}
+int cmd_wait_response(const char *arg)
+{
+ int wait_for = atoi(arg);
+ int i=0;
+ if( wait_for < 1 ) {
+ wait_for = 1;
+ };
+
+ for( i=0 ; i < wait_for ; ++i ) {
+ wait_and_handle_response(1);
+ };
+ return 0;
+}
+
static int cmd_help (const char *line);
typedef char *(*completerFunctionType)(const char *text, int state);
char *cmd;
int (*fun)(const char *arg);
char *ad;
- completerFunctionType rl_completerfunction;
+ completerFunctionType rl_completerfunction;
int complete_filenames;
- char **local_tabcompletes;
+ const char **local_tabcompletes;
} cmd_array[] = {
{"open", cmd_open, "('tcp'|'ssl')':<host>[':'<port>][/<db>]",NULL,0,NULL},
{"quit", cmd_quit, "",NULL,0,NULL},
{"delete", cmd_delete, "<setname>",NULL,0,NULL},
{"base", cmd_base, "<base-name>",NULL,0,NULL},
{"show", cmd_show, "<rec#>['+'<#recs>['+'<setname>]]",NULL,0,NULL},
+ {"setscan", cmd_setscan, "<term>",NULL,0,NULL},
{"scan", cmd_scan, "<term>",NULL,0,NULL},
{"scanstep", cmd_scanstep, "<size>",NULL,0,NULL},
{"scanpos", cmd_scanpos, "<size>",NULL,0,NULL},
{"schema", cmd_schema, "<schema>",complete_schema,0,NULL},
{"elements", cmd_elements, "<elementSetName>",NULL,0,NULL},
{"close", cmd_close, "",NULL,0,NULL},
- {"attributeset", cmd_attributeset, "<attrset>",complete_attributeset,0,NULL},
{"querytype", cmd_querytype, "<type>",complete_querytype,0,NULL},
{"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},
+ {"itemorder", cmd_itemorder, "ill|item|xml <itemno>",NULL,0,NULL},
+ {"update", cmd_update, "<action> <recid> [<doc>]",NULL,0,NULL},
+ {"update0", cmd_update0, "<action> <recid> [<doc>]",NULL,0,NULL},
+ {"xmles", cmd_xmles, "<OID> <doc>",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},
{"negcharset", cmd_negcharset, "<nego_charset>",NULL,0,NULL},
{"displaycharset", cmd_displaycharset, "<output_charset>",NULL,0,NULL},
{"marccharset", cmd_marccharset, "<charset_name>",NULL,0,NULL},
+ {"querycharset", cmd_querycharset, "<charset_name>",NULL,0,NULL},
{"lang", cmd_lang, "<language_code>",NULL,0,NULL},
+ {"source", cmd_source_echo, "<filename>",NULL,1,NULL},
{".", cmd_source_echo, "<filename>",NULL,1,NULL},
{"!", cmd_subshell, "Subshell command",NULL,1,NULL},
{"set_apdufile", cmd_set_apdufile, "<filename>",NULL,1,NULL},
{"set_cclfile", cmd_set_cclfile," <filename>",NULL,1,NULL},
{"set_cqlfile", cmd_set_cqlfile," <filename>",NULL,1,NULL},
{"set_auto_reconnect", cmd_set_auto_reconnect," on|off",complete_auto_reconnect,1,NULL},
+ {"set_auto_wait", cmd_set_auto_wait," on|off",complete_auto_reconnect,1,NULL},
{"set_otherinfo", cmd_set_otherinfo,"<otherinfoinddex> <oid> <string>",NULL,0,NULL},
{"sleep", cmd_sleep,"<seconds>",NULL,0,NULL},
{"register_oid", cmd_register_oid,"<name> <class> <oid>",NULL,0,NULL},
{"list_otherinfo",cmd_list_otherinfo,"[otherinfoinddex]",NULL,0,NULL},
{"list_all",cmd_list_all,"",NULL,0,NULL},
{"clear_otherinfo",cmd_clear_otherinfo,"",NULL,0,NULL},
+ {"wait_response",cmd_wait_response,"<number>",NULL,0,NULL},
/* Server Admin Functions */
{"adm-reindex", cmd_adm_reindex, "<database-name>",NULL,0,NULL},
{"adm-truncate", cmd_adm_truncate, "('database'|'index')<object-name>",NULL,0,NULL},
{"zversion", cmd_zversion, "", NULL, 0, NULL},
{"help", cmd_help, "", NULL,0,NULL},
{"init", cmd_init, "", NULL,0,NULL},
+ {"sru", cmd_sru, "", NULL,0,NULL},
+ {"exit", cmd_quit, "",NULL,0,NULL},
{0,0,0,0,0,0}
};
printf(" @or opl opr Or\n");
printf(" @not opl opr And-Not\n");
printf(" @set set Result set\n");
- printf(" @prox exl dist ord rel uc ut Proximity. Use help prox\n");
+ printf(" @prox exl dist ord rel uc ut Proximity. Use help prox\n");
printf("\n");
printf("Bib-1 attribute types\n");
printf("1=Use: ");
}
if (!strcmp(topic, "prox"))
{
- printf("Proximity:\n");
- printf(" @prox exl dist ord rel uc ut\n");
- printf(" exl: exclude flag . 0=include, 1=exclude.\n");
- printf(" dist: distance integer.\n");
- printf(" ord: order flag. 0=unordered, 1=ordered.\n");
- printf(" rel: relation integer. 1< 2<= 3= 4>= 5> 6!= .\n");
- printf(" uc: unit class. k=known, p=private.\n");
- printf(" ut: unit type. 1=character, 2=word, 3=sentence,\n");
- printf(" 4=paragraph, 5=section, 6=chapter, 7=document,\n");
- printf(" 8=element, 9=subelement, 10=elementType, 11=byte.\n");
- printf("\nExamples:\n");
- printf(" Search for a and b in-order at most 3 words apart:\n");
- printf(" @prox 0 3 1 2 k 2\n");
- printf(" Search for any order of a and b next to each other:\n");
- printf(" @prox 0 1 0 3 k 2\n");
+ printf("Proximity:\n");
+ printf(" @prox exl dist ord rel uc ut\n");
+ printf(" exl: exclude flag . 0=include, 1=exclude.\n");
+ printf(" dist: distance integer.\n");
+ printf(" ord: order flag. 0=unordered, 1=ordered.\n");
+ printf(" rel: relation integer. 1< 2<= 3= 4>= 5> 6!= .\n");
+ printf(" uc: unit class. k=known, p=private.\n");
+ printf(" ut: unit type. 1=character, 2=word, 3=sentence,\n");
+ printf(" 4=paragraph, 5=section, 6=chapter, 7=document,\n");
+ printf(" 8=element, 9=subelement, 10=elementType, 11=byte.\n");
+ printf("\nExamples:\n");
+ printf(" Search for a and b in-order at most 3 words apart:\n");
+ printf(" @prox 0 3 1 2 k 2 a b\n");
+ printf(" Search for any order of a and b next to each other:\n");
+ printf(" @prox 0 1 0 3 k 2 a b\n");
}
return 1;
}
-int cmd_register_tab(const char* arg) {
-
+int cmd_register_tab(const char* arg)
+{
+#if HAVE_READLINE_READLINE_H
char command[101], tabargument[101];
int i;
int num_of_tabs;
- char** tabslist;
+ const char** tabslist;
if (sscanf (arg, "%100s %100s", command, tabargument) < 1) {
return 0;
}
}
- if(!cmd_array[i].cmd) {
+ if (!cmd_array[i].cmd) {
fprintf(stderr,"Unknown command %s\n",command);
return 1;
}
- if(!cmd_array[i].local_tabcompletes)
- cmd_array[i].local_tabcompletes = (char **) calloc(1,sizeof(char**));
+ if (!cmd_array[i].local_tabcompletes)
+ cmd_array[i].local_tabcompletes = (const char **) calloc(1,sizeof(char**));
- num_of_tabs=0;
+ num_of_tabs=0;
tabslist = cmd_array[i].local_tabcompletes;
- for(;tabslist && *tabslist;tabslist++) {
+ for(; tabslist && *tabslist; tabslist++) {
num_of_tabs++;
}
- cmd_array[i].local_tabcompletes = (char **)
- realloc(cmd_array[i].local_tabcompletes,(num_of_tabs+2)*sizeof(char**));
- tabslist=cmd_array[i].local_tabcompletes;
- tabslist[num_of_tabs]=strdup(tabargument);
- tabslist[num_of_tabs+1]=NULL;
+ cmd_array[i].local_tabcompletes = (const char **)
+ realloc(cmd_array[i].local_tabcompletes,
+ (num_of_tabs+2)*sizeof(char**));
+ tabslist = cmd_array[i].local_tabcompletes;
+ tabslist[num_of_tabs] = strdup(tabargument);
+ tabslist[num_of_tabs+1] = NULL;
+#endif
return 1;
}
void process_cmd_line(char* line)
{
- int i,res;
+ int i, res;
char word[32], arg[10240];
#if HAVE_GETTIMEOFDAY
if(apdu_file) fflush(apdu_file);
- if (res >= 2)
- wait_and_handle_response();
+ if (res >= 2 && auto_wait)
+ wait_and_handle_response(0);
if(apdu_file)
fflush(apdu_file);
fflush(marc_file);
}
-
-char *command_generator(const char *text, int state)
+static char *command_generator(const char *text, int state)
{
+#if HAVE_READLINE_READLINE_H
static int idx;
if (state==0) {
idx = 0;
}
for( ; cmd_array[idx].cmd; ++idx) {
- if (!strncmp(cmd_array[idx].cmd,text,strlen(text))) {
+ if (!strncmp(cmd_array[idx].cmd, text, strlen(text))) {
++idx; /* skip this entry on the next run */
return strdup(cmd_array[idx-1].cmd);
}
}
+#endif
return NULL;
}
+#if HAVE_READLINE_READLINE_H
+static const char** default_completer_list = NULL;
+
+static char* default_completer(const char* text, int state)
+{
+ return complete_from_list(default_completer_list, text, state);
+}
+#endif
+
+#if HAVE_READLINE_READLINE_H
/*
This function only known how to complete on the first word
*/
-char ** readline_completer(char *text, int start, int end) {
-#if HAVE_READLINE_READLINE_H
-
- completerFunctionType completerToUse;
-
+char **readline_completer(char *text, int start, int end)
+{
+ completerFunctionType completerToUse;
+
if(start == 0) {
#if HAVE_READLINE_RL_COMPLETION_MATCHES
- char** res=rl_completion_matches(text,
- command_generator);
+ char** res = rl_completion_matches(text, command_generator);
#else
- char** res=completion_matches(text,
- (CPFunction*)command_generator);
+ char** res = completion_matches(text,
+ (CPFunction*)command_generator);
#endif
rl_attempted_completion_over = 1;
return res;
return NULL;
}
- for (i = 0; cmd_array[i].cmd; i++) {
- if (!strncmp(cmd_array[i].cmd, word, strlen(word))) {
+ for (i = 0; cmd_array[i].cmd; i++)
+ if (!strncmp(cmd_array[i].cmd, word, strlen(word)))
break;
- }
- }
- if(!cmd_array[i].cmd) return NULL;
+ if(!cmd_array[i].cmd)
+ return NULL;
- curret_global_list = cmd_array[i].local_tabcompletes;
+ default_completer_list = cmd_array[i].local_tabcompletes;
completerToUse = cmd_array[i].rl_completerfunction;
- if(completerToUse==NULL) /* if no pr. command completer is defined use the default completer */
+ if (!completerToUse)
+ { /* if command completer is not defined use the default completer */
completerToUse = default_completer;
-
- if(completerToUse) {
+ }
+ if (completerToUse) {
#ifdef HAVE_READLINE_RL_COMPLETION_MATCHES
char** res=
- rl_completion_matches(text,
- completerToUse);
+ rl_completion_matches(text, completerToUse);
#else
char** res=
- completion_matches(text,
- (CPFunction*)completerToUse);
+ completion_matches(text, (CPFunction*)completerToUse);
#endif
- if(!cmd_array[i].complete_filenames)
+ if (!cmd_array[i].complete_filenames)
rl_attempted_completion_over = 1;
return res;
} else {
- if(!cmd_array[i].complete_filenames)
+ if (!cmd_array[i].complete_filenames)
rl_attempted_completion_over = 1;
return 0;
}
}
-#else
- return 0;
-#endif
}
+#endif
+#ifndef WIN32
+void ctrl_c_handler(int x)
+{
+ exit_client(0);
+}
+#endif
static void client(void)
{
line[10239] = '\0';
+#ifndef WIN32
+ signal(SIGINT, ctrl_c_handler);
+#endif
+
#if HAVE_GETTIMEOFDAY
gettimeofday (&tv_start, 0);
#endif
if (*line_in)
add_history(line_in);
#endif
- strncpy(line, line_in, 10239);
- free (line_in);
+ strncpy(line, line_in, sizeof(line)-1);
+ free(line_in);
}
#endif
if (!line_in)
char *end_p;
printf (C_PROMPT);
fflush(stdout);
- if (!fgets(line, 10239, stdin))
+ if (!fgets(line, sizeof(line)-1, stdin))
break;
if ((end_p = strchr (line, '\n')))
*end_p = '\0';
}
+ if (isatty(0))
+ file_history_add_line(file_history, line);
process_cmd_line(line);
}
}
yaz_version(vstr, 0);
printf ("YAZ version: %s\n", YAZ_VERSION);
if (strcmp(vstr, YAZ_VERSION))
- printf ("YAZ DLL/SO: %s\n", vstr);
+ printf ("YAZ DLL/SO: %s\n", vstr);
exit(0);
}
char *open_command = 0;
char *auth_command = 0;
char *arg;
+ const char *rc_file = 0;
int ret;
#if HAVE_LOCALE_H
#endif
#endif
if (codeset)
- outputCharset = xstrdup(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_sort);
ODR_MASK_SET(&z3950_options, Z_Options_extendedServices);
ODR_MASK_SET(&z3950_options, Z_Options_delSet);
+ ODR_MASK_SET(&z3950_options, Z_Options_negotiationModel);
- while ((ret = options("k:c:q:a:b:m:v:p:u:t:Vxd:", argv, argc, &arg)) != -2)
+ while ((ret = options("k:c:q:a:b:m:v:p:u:t:Vxd:f:", argv, argc, &arg)) != -2)
{
switch (ret)
{
strcpy (open_command, "open ");
strcat (open_command, arg);
}
- else
- {
- fprintf(stderr, "%s: Specify at most one server address\n",
- prog);
- exit(1);
- }
+ else
+ {
+ fprintf(stderr, "%s: Specify at most one server address\n",
+ prog);
+ exit(1);
+ }
+ break;
+ case 'a':
+ if (!strcmp(arg, "-"))
+ apdu_file=stderr;
+ else
+ apdu_file=fopen(arg, "a");
+ break;
+ case 'b':
+ if (!strcmp(arg, "-"))
+ ber_file=stderr;
+ else
+ ber_file=fopen(arg, "a");
+ break;
+ case 'c':
+ strncpy (ccl_fields, arg, sizeof(ccl_fields)-1);
+ ccl_fields[sizeof(ccl_fields)-1] = '\0';
+ break;
+ case 'd':
+ dump_file_prefix = arg;
+ break;
+ case 'f':
+ rc_file = arg;
break;
- case 'd':
- dump_file_prefix = arg;
- break;
case 'k':
kilobytes = atoi(arg);
break;
exit (1);
}
break;
- case 't':
- outputCharset = xstrdup(arg);
- break;
- case 'c':
- strncpy (ccl_fields, arg, sizeof(ccl_fields)-1);
- ccl_fields[sizeof(ccl_fields)-1] = '\0';
+ case 'p':
+ yazProxy = xstrdup(arg);
break;
case 'q':
strncpy (cql_fields, arg, sizeof(cql_fields)-1);
cql_fields[sizeof(cql_fields)-1] = '\0';
break;
- case 'b':
- if (!strcmp(arg, "-"))
- ber_file=stderr;
- else
- ber_file=fopen(arg, "a");
- break;
- case 'a':
- if (!strcmp(arg, "-"))
- apdu_file=stderr;
- else
- apdu_file=fopen(arg, "a");
- break;
- case 'x':
- hex_dump = 1;
- break;
- case 'p':
- yazProxy=strdup(arg);
+ case 't':
+ outputCharset = xstrdup(arg);
break;
case 'u':
if (!auth_command)
yaz_log_init(yaz_log_mask_str(arg), "", 0);
break;
case 'V':
- show_version();
+ show_version();
+ break;
+ case 'x':
+ hex_dump = 1;
break;
default:
- fprintf (stderr, "Usage: %s [-m <marclog>] [ -a <apdulog>] "
- "[-b berdump] [-c cclfields] \n"
- "[-q cqlfields] [-p <proxy-addr>] [-u <auth>] "
- "[-k size] [-d dump] [-V] [<server-addr>]\n",
+ fprintf (stderr, "Usage: %s "
+ " [-a apdulog]"
+ " [-b berdump]"
+ " [-c cclfile]"
+ " [-d dump]"
+ " [-f cmdfile]"
+ " [-k size]"
+ " [-m marclog]"
+ " [-p proxy-addr]"
+ " [-q cqlfile]"
+ " [-t dispcharset]"
+ " [-u auth]"
+ " [-v loglevel]"
+ " [-V]"
+ " [-x]"
+ " [server-addr]\n",
prog);
exit (1);
}
}
- initialize();
+ initialize(rc_file);
if (auth_command)
{
#ifdef HAVE_GETTIMEOFDAY
#endif
xfree(open_command);
}
- client ();
- exit (0);
+ client();
+ exit_client(0);
+ return 0;
}
-
/*
* Local variables:
- * tab-width: 8
* c-basic-offset: 4
+ * indent-tabs-mode: nil
* End:
- * vim600: sw=4 ts=8 fdm=marker
- * vim<600: sw=4 ts=8
+ * vim: shiftwidth=4 tabstop=8 expandtab
*/
+
projects / yaz-moved-to-github.git / blobdiff