-/*
- * Copyright (C) 1995-2006, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
* See the file LICENSE for details.
- *
- * $Id: client.c,v 1.319 2006-11-14 08:37:16 adam Exp $
*/
/** \file client.c
* \brief yaz-client program
#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 <sys/time.h>
#endif
-#if HAVE_OPENSSL_SSL_H
-#include <openssl/bio.h>
-#include <openssl/crypto.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#endif
-
#ifdef WIN32
#include <sys/stat.h>
#include <io.h>
#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 char *sru_method = "soap";
+static file_history_t file_history = 0;
+
+static char sru_method[10] = "soap";
+static char sru_version[10] = "1.2";
static char *codeset = 0; /* character set for output */
static int hex_dump = 0;
static char *dump_file_prefix = 0;
static FILE *apdu_file = 0;
static FILE *ber_file = 0;
static COMSTACK conn = 0; /* our z-association */
+
static Z_IdAuthentication *auth = 0; /* our current auth definition */
+static NMEM nmem_auth = NULL;
+
char *databaseNames[128];
int num_databaseNames = 0;
static Z_External *record_last = 0;
static int smallSetUpperBound = 0;
static int largeSetLowerBound = 1;
static int mediumSetPresentNumber = 0;
-static Z_ElementSetNames *elementSetNames = 0;
-static int setno = 1; /* current set offset */
+static Z_ElementSetNames *elementSetNames = 0;
+static Odr_int setno = 1; /* current set offset */
static enum oid_proto protocol = PROTO_Z3950; /* current app protocol */
#define RECORDSYNTAX_MAX 20
-static enum oid_value recordsyntax_list[RECORDSYNTAX_MAX] = { VAL_USMARC };
-static int recordsyntax_size = 1;
+static char *recordsyntax_list[RECORDSYNTAX_MAX];
+static int recordsyntax_size = 0;
static char *record_schema = 0;
static int sent_close = 0;
static int negotiationCharsetVersion = 3;
static char *outputCharset = 0;
static char *marcCharset = 0;
+static char *queryCharset = 0;
static char* yazLang = 0;
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 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);
#if HAVE_READLINE_READLINE_H
#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);
-static void close_session (void);
+static void marc_file_write(const char *buf, size_t sz);
+
+static void wait_and_handle_response(int one_response_only);
ODR getODROutputStream(void)
{
return out;
}
-const char* query_type_as_string(QueryType q)
+const char* query_type_as_string(QueryType q)
{
- switch (q) {
+ switch (q) {
case QueryType_Prefix: return "prefix (RPN sent to server)";
case QueryType_CCL: return "CCL (CCL sent to server) ";
case QueryType_CCL2RPN: return "CCL -> RPN (RPN sent to server)";
case QueryType_CQL: return "CQL (CQL sent to server)";
case QueryType_CQL2RPN: return "CQL -> RPN (RPN sent to server)";
- default:
+ default:
return "unknown Query type internal yaz-client error";
}
}
-static void do_hex_dump(const char* buf, int len)
+static void do_hex_dump(const char* buf, size_t len)
{
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)
+ size_t i;
+ int x;
+ for (i = 0; i < len ; i = i+16 )
+ {
+ printf(" %4.4ld ", (long) i);
+ for(x=0 ; i+x<len && x<16; ++x)
{
printf("%2.2X ",(unsigned int)((unsigned char)buf[i+x]));
}
{
char fname[1024];
FILE *of;
- sprintf (fname, "%s.%03d.raw", dump_file_prefix, no);
+ sprintf(fname, "%s.%03d.raw", dump_file_prefix, no);
of = fopen(fname, "wb");
-
- fwrite (buf, 1, len, of);
-
- fclose(of);
+
+ if (fwrite(buf, 1, len, of) != len)
+ {
+ printf("write failed for %s", fname);
+ }
+ if (fclose(of))
+ {
+ printf("close failed for %s", fname);
+ }
}
}
}
-void add_otherInfos(Z_APDU *a)
+void add_otherInfos(Z_APDU *a)
{
Z_OtherInformation **oi;
int i;
-
+
yaz_oi_APDU(a, &oi);
- for(i=0; i<maxOtherInfosSupported; ++i)
+ 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);
- }
+ }
}
int send_apdu(Z_APDU *a)
{
char *buf;
int len;
-
+
add_otherInfos(a);
-
+
if (apdu_file)
{
z_APDU(print, &a, 0, 0);
{
size_t i;
for (i = 0; i<len; i++)
- if ((buf[i] <= 126 && buf[i] >= 32) || strchr ("\n\r\t\f", buf[i]))
- printf ("%c", buf[i]);
+ if ((buf[i] <= 126 && buf[i] >= 32) || strchr("\n\r\t\f", buf[i]))
+ printf("%c", buf[i]);
else
- printf ("\\X%02X", buf[i]);
+ printf("\\X%02X", buf[i]);
}
-static void print_refid (Z_ReferenceId *id)
+static void print_refid(Z_ReferenceId *id)
{
if (id)
{
- printf ("Reference Id: ");
- print_stringn (id->buf, id->len);
- printf ("\n");
+ printf("Reference Id: ");
+ print_stringn(id->buf, id->len);
+ printf("\n");
}
}
-static Z_ReferenceId *set_refid (ODR out)
+static Z_ReferenceId *set_refid(ODR out)
{
Z_ReferenceId *id;
if (!refid)
return 0;
- id = (Z_ReferenceId *) odr_malloc (out, sizeof(*id));
+ id = (Z_ReferenceId *) odr_malloc(out, sizeof(*id));
id->size = id->len = strlen(refid);
- id->buf = (unsigned char *) odr_malloc (out, id->len);
- memcpy (id->buf, refid, id->len);
+ id->buf = (unsigned char *) odr_malloc(out, id->len);
+ memcpy(id->buf, refid, id->len);
return id;
-}
+}
/* INIT SERVICE ------------------------------- */
req->idAuthentication = auth;
- req->referenceId = set_refid (out);
+ req->referenceId = set_refid(out);
+
+ if (yazProxy && type_and_host)
+ {
+ yaz_oi_set_string_oid(&req->otherInfo, out, yaz_oid_userinfo_proxy,
+ 1, type_and_host);
+ }
- if (yazProxy && type_and_host)
- yaz_oi_set_string_oidval(&req->otherInfo, out, VAL_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))) {
+
+ 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,
+ yaz_set_proposal_charneg_list(out, ",",
+ negotiationCharset,
yazLang,
negotiationCharsetRecords);
}
}
-
if (send_apdu(apdu))
printf("Sent initrequest.\n");
}
static void pr_opt(const char *opt, void *clientData)
{
- printf (" %s", opt);
+ printf(" %s", opt);
}
static int process_initResponse(Z_InitResponse *res)
printf("'%.*s'\n", uif->u.octet_aligned->len,
uif->u.octet_aligned->buf);
}
- else if (uif->which == Z_External_single)
+ 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) {
+ 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");
+ printf("Bad OCLC UserInformation:\n");
else
- printf ("OCLC UserInformation:\n");
+ printf("OCLC UserInformation:\n");
if (!z_OCLC_UserInformation(print, &oclc_ui, 0, 0))
- printf ("Bad OCLC UserInformation spec\n");
+ 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);
+ printf("yaz-client ignoring unrecognised userInformationField: %d-octet External '%.*s'\n",
+ (int) sat->len, sat->len, sat->buf);
}
}
- odr_reset (print);
+ odr_reset(print);
}
}
- printf ("Options:");
+ printf("Options:");
yaz_init_opt_decode(res->options, pr_opt, 0);
- printf ("\n");
+ printf("\n");
if (ODR_MASK_GET(res->options, Z_Options_namedResultSets))
setnumber = 0;
-
+
if (ODR_MASK_GET(res->options, Z_Options_negotiationModel)) {
-
+
Z_CharSetandLanguageNegotiation *p =
yaz_get_charneg_record(res->otherInfo);
-
- if (p) {
-
+
+ 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);
+ 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);
+ 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 records in ...: %d\n", selected );
}
}
- fflush (stdout);
+ fflush(stdout);
return 0;
}
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
+ else
{
printf("unsupported otherInfo unit external %d\n",
- unit->information.externallyDefinedInfo ?
+ unit->information.externallyDefinedInfo ?
unit->information.externallyDefinedInfo->which : -2);
}
}
case Z_DiagnosticFormat_s_defaultDiagRec: {
Z_DefaultDiagFormat *dd = ds->u.defaultDiagRec;
/* ### should check `dd->diagnosticSetId' */
- printf("code=%d (%s)", *dd->condition,
+ printf("code=" ODR_INT_PRINTF " (%s)", *dd->condition,
diagbib1_str(*dd->condition));
/* Both types of addinfo are the same, so use type-pun */
if (dd->u.v2Addinfo != 0)
const char *cp;
for (i = 0; i<num_databaseNames; i++)
- xfree (databaseNames[i]);
+ xfree(databaseNames[i]);
num_databaseNames = 0;
while (1)
{
cp = arg + strlen(arg);
if (cp - arg < 1)
break;
- databaseNames[num_databaseNames] = (char *)xmalloc (1 + cp - arg);
- memcpy (databaseNames[num_databaseNames], arg, cp - arg);
+ databaseNames[num_databaseNames] = (char *)xmalloc(1 + cp - arg);
+ memcpy(databaseNames[num_databaseNames], arg, cp - arg);
databaseNames[num_databaseNames][cp - arg] = '\0';
for (cp1 = databaseNames[num_databaseNames]; *cp1 ; cp1++)
return 1;
}
-static int parse_cmd_doc(const char **arg, ODR out, char **buf,
- int *len, int opt)
+static int parse_cmd_doc(const char **arg, ODR out, char **buf, int *len)
{
const char *sep;
while (**arg && strchr(" \t\n\r\f", **arg))
(*arg)++;
- if ((*arg)[0] == '\"' && (sep=strchr(*arg+1, '"')))
+ if (**arg == '\0')
{
- (*arg)++;
- *len = sep - *arg;
- *buf = odr_strdupn(out, *arg, *len);
- (*arg) = sep+1;
- return 1;
+ return 0;
}
- else if ((*arg)[0] && (*arg)[0] != '\"')
+ else if ((*arg)[0] == '<')
{
- long fsize;
+ size_t fsize;
FILE *inf;
- const char *fname = *arg;
-
+ const char *fname;
+ const char *arg_start = ++(*arg);
+
while (**arg != '\0' && **arg != ' ')
(*arg)++;
-
+
+ fname = odr_strdupn(out, arg_start, *arg - arg_start);
+
inf = fopen(fname, "rb");
if (!inf)
{
return 0;
}
*len = fsize;
- *buf = odr_malloc(out, fsize);
+ *buf = (char *) odr_malloc(out, fsize+1);
+ (*buf)[fsize] = '\0';
if (fread(*buf, 1, fsize, inf) != fsize)
{
printf("Unable to read %s\n", fname);
return 0;
}
fclose(inf);
- return 1;
}
- else if (**arg == '\0')
+ else if ((*arg)[0] == '\"' && (sep=strchr(*arg+1, '"')))
{
- if (opt)
- {
- *len = 0;
- *buf = 0;
- return 1;
- }
- printf("Missing doc argument\n");
+ (*arg)++;
+ *len = sep - *arg;
+ *buf = odr_strdupn(out, *arg, *len);
+ (*arg) = sep+1;
}
else
- printf("Bad doc argument %s\n", *arg);
- return 0;
+ {
+ const char *arg_start = *arg;
+
+ while (**arg != '\0' && **arg != ' ')
+ (*arg)++;
+
+ *len = *arg - arg_start;
+ *buf = odr_strdupn(out, arg_start, *len);
+ }
+ return 1;
}
static int cmd_base(const char *arg)
return set_base(arg);
}
-void cmd_open_remember_last_open_command(const char* arg, char* new_open_command)
-{
- if(last_open_command != arg)
- {
- if(last_open_command) xfree(last_open_command);
- last_open_command = xstrdup(new_open_command);
- }
-}
-
int session_connect(const char *arg)
{
void *add;
char type_and_host[101];
const char *basep = 0;
-#if HAVE_OPENSSL_SSL_H
- SSL *ssl;
-#endif
if (conn)
{
- cs_close (conn);
+ cs_close(conn);
conn = 0;
- }
+ }
if (session_mem)
{
- nmem_destroy (session_mem);
+ nmem_destroy(session_mem);
session_mem = NULL;
session_initResponse = 0;
}
strncpy(type_and_host, arg, sizeof(type_and_host)-1);
type_and_host[sizeof(type_and_host)-1] = '\0';
- cmd_open_remember_last_open_command(arg, type_and_host);
-
if (yazProxy)
conn = cs_create_host(yazProxy, 1, &add);
else
conn = cs_create_host(arg, 1, &add);
if (!conn)
{
- printf ("Could not resolve address %s\n", arg);
+ printf("Could not resolve address %s\n", arg);
return 0;
}
#if YAZ_HAVE_XML2
- if (conn->protocol == PROTO_HTTP)
- queryType = QueryType_CQL;
#else
if (conn->protocol == PROTO_HTTP)
{
- printf ("SRW/HTTP not enabled in this YAZ\n");
+ printf("SRW/HTTP not enabled in this YAZ\n");
cs_close(conn);
conn = 0;
return 0;
fflush(stdout);
if (cs_connect(conn, add) < 0)
{
- printf ("error = %s\n", cs_strerror(conn));
+ printf("error = %s\n", cs_strerror(conn));
cs_close(conn);
conn = 0;
return 0;
}
printf("OK.\n");
-#if HAVE_OPENSSL_SSL_H
- if ((ssl = (SSL *) cs_get_ssl(conn)))
- {
- X509 *server_cert = SSL_get_peer_certificate (ssl);
-
- 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);
- }
- }
-#endif
+ cs_print_session_info(conn);
if (basep && *basep)
set_base (basep);
if (protocol == PROTO_Z3950)
int cmd_open(const char *arg)
{
+ int r;
if (arg)
{
- strncpy (cur_host, arg, sizeof(cur_host)-1);
+ strncpy(cur_host, arg, sizeof(cur_host)-1);
cur_host[sizeof(cur_host)-1] = 0;
}
- return session_connect(cur_host);
-}
-
-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);
+ r = session_connect(cur_host);
+ if (conn && conn->protocol == PROTO_HTTP)
+ queryType = QueryType_CQL;
+ return r;
}
int cmd_authentication(const char *arg)
{
- static Z_IdAuthentication au;
- static char user[40], group[40], pass[40];
- static Z_IdPass idPass;
+ char **args;
int r;
- if (!*arg)
- {
- printf("Auth field set to null\n");
- auth = 0;
- return 1;
- }
- r = sscanf (arg, "%39s %39s %39s", user, group, pass);
+ nmem_reset(nmem_auth);
+ nmem_strsplit_blank(nmem_auth, arg, &args, &r);
+
if (r == 0)
{
printf("Authentication set to null\n");
auth = 0;
}
- if (r == 1)
+ else if (r == 1)
{
- auth = &au;
- if (!strcmp(user, "-")) {
- au.which = Z_IdAuthentication_anonymous;
+ auth = (Z_IdAuthentication *) nmem_malloc(nmem_auth, sizeof(*auth));
+ if (!strcmp(args[0], "-"))
+ {
+ auth->which = Z_IdAuthentication_anonymous;
+ auth->u.anonymous = odr_nullval();
printf("Authentication set to Anonymous\n");
- } else {
- au.which = Z_IdAuthentication_open;
- au.u.open = user;
- printf("Authentication set to Open (%s)\n", user);
+ }
+ else
+ {
+ auth->which = Z_IdAuthentication_open;
+ auth->u.open = args[0];
+ printf("Authentication set to Open (%s)\n", args[0]);
}
}
- if (r == 2)
- {
- auth = &au;
- au.which = Z_IdAuthentication_idPass;
- au.u.idPass = &idPass;
- idPass.groupId = NULL;
- idPass.userId = user;
- idPass.password = group;
- printf("Authentication set to User (%s), Pass (%s)\n", user, group);
+ else if (r == 2)
+ {
+ auth = (Z_IdAuthentication *) nmem_malloc(nmem_auth, sizeof(*auth));
+ auth->which = Z_IdAuthentication_idPass;
+ auth->u.idPass = (Z_IdPass *)
+ nmem_malloc(nmem_auth, sizeof(*auth->u.idPass));
+ auth->u.idPass->groupId = NULL;
+ auth->u.idPass->userId = !strcmp(args[0], "-") ? 0 : args[0];
+ auth->u.idPass->password = !strcmp(args[1], "-") ? 0 : args[1];
+ printf("Authentication set to User (%s), Pass (%s)\n",
+ args[0], args[1]);
+ }
+ else if (r == 3)
+ {
+ auth = (Z_IdAuthentication*) nmem_malloc(nmem_auth, sizeof(*auth));
+ auth->which = Z_IdAuthentication_idPass;
+ auth->u.idPass = (Z_IdPass *)
+ nmem_malloc(nmem_auth, sizeof(*auth->u.idPass));
+ auth->u.idPass->groupId = args[1];
+ auth->u.idPass->userId = args[0];
+ auth->u.idPass->password = args[2];
+ printf("Authentication set to User (%s), Group (%s), Pass (%s)\n",
+ args[0], args[1], args[2]);
}
- if (r == 3)
+ else
{
- auth = &au;
- au.which = Z_IdAuthentication_idPass;
- au.u.idPass = &idPass;
- idPass.groupId = group;
- idPass.userId = user;
- idPass.password = pass;
- printf("Authentication set to User (%s), Group (%s), Pass (%s)\n",
- user, group, pass);
+ printf("Bad number of args to auth\n");
+ auth = 0;
}
+
return 1;
}
static void print_record(const unsigned char *buf, size_t len)
{
size_t i = len;
- print_stringn (buf, len);
+ print_stringn(buf, len);
/* add newline if not already added ... */
if (i <= 0 || buf[i-1] != '\n')
- printf ("\n");
+ printf("\n");
}
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)
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 */
} else {
/*
}
}
}
- 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);
+ marc_file_write((const char *) r->u.octet_aligned->buf,
+ r->u.octet_aligned->len);
}
- 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";
- }
- 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");
+ if (octet_buf[9] == 'a')
+ from = "UTF-8";
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");
+ }
+ }
+
+ if (yaz_marc_decode_buf(mt, octet_buf, r->u.octet_aligned->len,
+ &result, &rlen)> 0)
+ {
+ if (fwrite(result, rlen, 1, stdout) != 1)
+ {
+ printf("write to stdout failed\n");
}
}
else
{
- printf ("bad MARC. Dumping as it is:\n");
+ 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);
r->u.octet_aligned->len);
}
}
- if (marc_file)
- fwrite (octet_buf, 1, r->u.octet_aligned->len, marc_file);
+ marc_file_write(octet_buf, r->u.octet_aligned->len);
}
- else if (ent && ent->value == VAL_SUTRS)
+ else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_sutrs))
{
if (r->which != Z_External_sutrs)
{
return;
}
print_record(r->u.sutrs->buf, r->u.sutrs->len);
- if (marc_file)
- fwrite (r->u.sutrs->buf, 1, r->u.sutrs->len, marc_file);
+ marc_file_write((const char *) r->u.sutrs->buf, r->u.sutrs->len);
}
- 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);
+ puts(wrbuf_cstr(w));
+ wrbuf_destroy(w);
}
- else if (ent && ent->value == VAL_OPAC)
+ else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_opac))
{
int i;
if (r->u.opac->bibliographicRecord)
Z_HoldingsRecord *h = r->u.opac->holdingsData[i];
if (h->which == Z_HoldingsRecord_marcHoldingsRecord)
{
- printf ("MARC holdings %d\n", i);
+ printf("MARC holdings %d\n", i);
display_record(h->u.marcHoldingsRecord);
}
else if (h->which == Z_HoldingsRecord_holdingsAndCirc)
Z_HoldingsAndCircData *data = h->u.holdingsAndCirc;
- printf ("Data holdings %d\n", i);
+ printf("Data holdings %d\n", i);
if (data->typeOfRecord)
- printf ("typeOfRecord: %s\n", data->typeOfRecord);
+ printf("typeOfRecord: %s\n", data->typeOfRecord);
if (data->encodingLevel)
- printf ("encodingLevel: %s\n", data->encodingLevel);
+ printf("encodingLevel: %s\n", data->encodingLevel);
if (data->receiptAcqStatus)
- printf ("receiptAcqStatus: %s\n", data->receiptAcqStatus);
+ printf("receiptAcqStatus: %s\n", data->receiptAcqStatus);
if (data->generalRetention)
- printf ("generalRetention: %s\n", data->generalRetention);
+ printf("generalRetention: %s\n", data->generalRetention);
if (data->completeness)
- printf ("completeness: %s\n", data->completeness);
+ printf("completeness: %s\n", data->completeness);
if (data->dateOfReport)
- printf ("dateOfReport: %s\n", data->dateOfReport);
+ printf("dateOfReport: %s\n", data->dateOfReport);
if (data->nucCode)
- printf ("nucCode: %s\n", data->nucCode);
+ printf("nucCode: %s\n", data->nucCode);
if (data->localLocation)
- printf ("localLocation: %s\n", data->localLocation);
+ printf("localLocation: %s\n", data->localLocation);
if (data->shelvingLocation)
- printf ("shelvingLocation: %s\n", data->shelvingLocation);
+ printf("shelvingLocation: %s\n", data->shelvingLocation);
if (data->callNumber)
- printf ("callNumber: %s\n", data->callNumber);
+ printf("callNumber: %s\n", data->callNumber);
if (data->shelvingData)
- printf ("shelvingData: %s\n", data->shelvingData);
+ printf("shelvingData: %s\n", data->shelvingData);
if (data->copyNumber)
- printf ("copyNumber: %s\n", data->copyNumber);
+ printf("copyNumber: %s\n", data->copyNumber);
if (data->publicNote)
- printf ("publicNote: %s\n", data->publicNote);
+ printf("publicNote: %s\n", data->publicNote);
if (data->reproductionNote)
- printf ("reproductionNote: %s\n", data->reproductionNote);
+ printf("reproductionNote: %s\n", data->reproductionNote);
if (data->termsUseRepro)
- printf ("termsUseRepro: %s\n", data->termsUseRepro);
+ printf("termsUseRepro: %s\n", data->termsUseRepro);
if (data->enumAndChron)
- printf ("enumAndChron: %s\n", data->enumAndChron);
+ printf("enumAndChron: %s\n", data->enumAndChron);
for (j = 0; j<data->num_volumes; j++)
{
- printf ("volume %d\n", j);
+ printf("volume %d\n", j);
if (data->volumes[j]->enumeration)
- printf (" enumeration: %s\n",
+ printf(" enumeration: %s\n",
data->volumes[j]->enumeration);
if (data->volumes[j]->chronology)
- printf (" chronology: %s\n",
+ printf(" chronology: %s\n",
data->volumes[j]->chronology);
if (data->volumes[j]->enumAndChron)
- printf (" enumAndChron: %s\n",
+ printf(" enumAndChron: %s\n",
data->volumes[j]->enumAndChron);
}
for (j = 0; j<data->num_circulationData; j++)
{
- printf ("circulation %d\n", j);
+ printf("circulation %d\n", j);
if (data->circulationData[j]->availableNow)
- printf (" availableNow: %d\n",
+ printf(" availableNow: %d\n",
*data->circulationData[j]->availableNow);
if (data->circulationData[j]->availablityDate)
- printf (" availabiltyDate: %s\n",
+ printf(" availabiltyDate: %s\n",
data->circulationData[j]->availablityDate);
if (data->circulationData[j]->availableThru)
- printf (" availableThru: %s\n",
+ printf(" availableThru: %s\n",
data->circulationData[j]->availableThru);
if (data->circulationData[j]->restrictions)
- printf (" restrictions: %s\n",
+ printf(" restrictions: %s\n",
data->circulationData[j]->restrictions);
if (data->circulationData[j]->itemId)
- printf (" itemId: %s\n",
+ printf(" itemId: %s\n",
data->circulationData[j]->itemId);
if (data->circulationData[j]->renewable)
- printf (" renewable: %d\n",
+ printf(" renewable: %d\n",
*data->circulationData[j]->renewable);
if (data->circulationData[j]->onHold)
- printf (" onHold: %d\n",
+ printf(" onHold: %d\n",
*data->circulationData[j]->onHold);
if (data->circulationData[j]->enumAndChron)
- printf (" enumAndChron: %s\n",
+ printf(" enumAndChron: %s\n",
data->circulationData[j]->enumAndChron);
if (data->circulationData[j]->midspine)
- printf (" midspine: %s\n",
+ printf(" midspine: %s\n",
data->circulationData[j]->midspine);
if (data->circulationData[j]->temporaryLocation)
- printf (" temporaryLocation: %s\n",
+ printf(" temporaryLocation: %s\n",
data->circulationData[j]->temporaryLocation);
}
}
}
}
- else
+ else
{
printf("Unknown record representation.\n");
if (!z_External(print, &r, 0, 0))
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");
- printf(" [%d] %s", *r->condition, diagbib1_str(*r->condition));
+
+ 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(" [" ODR_INT_PRINTF "] %s",
+ *r->condition, diagbib1_str(*r->condition));
switch (r->which)
{
case Z_DefaultDiagFormat_v2Addinfo:
- printf (" -- v2 addinfo '%s'\n", r->u.v2Addinfo);
+ printf(" -- v2 addinfo '%s'\n", r->u.v2Addinfo);
break;
case Z_DefaultDiagFormat_v3Addinfo:
- printf (" -- v3 addinfo '%s'\n", r->u.v3Addinfo);
+ printf(" -- v3 addinfo '%s'\n", r->u.v3Addinfo);
break;
}
}
Z_DiagRec dr, *dr_p = &dr;
dr.which = Z_DiagRec_defaultFormat;
dr.u.defaultFormat = p->u.nonSurrogateDiagnostic;
- display_diagrecs (&dr_p, 1);
+ display_diagrecs(&dr_p, 1);
}
else if (p->which == Z_Records_multipleNSD)
- display_diagrecs (p->u.multipleNonSurDiagnostics->diagRecs,
+ display_diagrecs(p->u.multipleNonSurDiagnostics->diagRecs,
p->u.multipleNonSurDiagnostics->num_diagRecs);
- else
+ else
{
printf("Records: %d\n", p->u.databaseOrSurDiagnostics->num_records);
for (i = 0; i < p->u.databaseOrSurDiagnostics->num_records; i++)
Z_APDU *apdu = zget_APDU(out, Z_APDU_deleteResultSetRequest);
Z_DeleteResultSetRequest *req = apdu->u.deleteResultSetRequest;
- req->referenceId = set_refid (out);
+ req->referenceId = set_refid(out);
req->num_resultSetList =
- sscanf (arg, "%30s %30s %30s %30s %30s %30s %30s %30s",
- names[0], names[1], names[2], names[3],
- names[4], names[5], names[6], names[7]);
+ sscanf(arg, "%30s %30s %30s %30s %30s %30s %30s %30s",
+ names[0], names[1], names[2], names[3],
+ names[4], names[5], names[6], names[7]);
- req->deleteFunction = (int *)
- odr_malloc (out, sizeof(*req->deleteFunction));
+ req->deleteFunction = odr_intdup(out, 0);
if (req->num_resultSetList > 0)
{
*req->deleteFunction = Z_DeleteResultSetRequest_list;
req->resultSetList = (char **)
- odr_malloc (out, sizeof(*req->resultSetList)*
+ odr_malloc(out, sizeof(*req->resultSetList)*
req->num_resultSetList);
for (i = 0; i<req->num_resultSetList; i++)
req->resultSetList[i] = names[i];
*req->deleteFunction = Z_DeleteResultSetRequest_all;
req->resultSetList = 0;
}
-
+
send_apdu(apdu);
printf("Sent deleteResultSetRequest.\n");
return 2;
Z_GDU *gdu;
char *path = 0;
- path = odr_malloc(out, 2+strlen(databaseNames[0]));
+ path = (char *) odr_malloc(out, 2+strlen(databaseNames[0]));
*path = '/';
strcpy(path+1, databaseNames[0]);
gdu = z_get_HTTP_Request_host_path(out, host_port, path);
- if (!strcmp(sru_method, "get"))
+ if (!yaz_matchstr(sru_method, "get"))
{
yaz_sru_get_encode(gdu->u.HTTP_Request, sr, out, charset);
}
- else if (!strcmp(sru_method, "post"))
+ else if (!yaz_matchstr(sru_method, "post"))
{
yaz_sru_post_encode(gdu->u.HTTP_Request, sr, out, charset);
}
- else if (!strcmp(sru_method, "soap"))
+ else if (!yaz_matchstr(sru_method, "soap"))
{
yaz_sru_soap_encode(gdu->u.HTTP_Request, sr, out, charset);
}
if (apdu_file)
{
if (!z_GDU(print, &gdu, 0, 0))
- printf ("Failed to print outgoing SRU package\n");
+ 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);
cd = yaz_iconv_open("UTF-8", in_charset);
if (!cd)
{
- wrbuf_free(w, 1);
+ 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;
}
static int send_SRW_scanRequest(const char *arg, int pos, int num)
{
Z_SRW_PDU *sr = 0;
-
+
/* regular requestse .. */
- sr = yaz_srw_get(out, Z_SRW_scan_request);
+ sr = yaz_srw_get_pdu(out, Z_SRW_scan_request, sru_version);
switch(queryType)
{
sr->u.scan_request->scanClause.pqf = encode_SRW_term(out, arg);
break;
default:
- printf ("Only CQL and PQF supported in SRW\n");
+ printf("Only CQL and PQF supported in SRW\n");
return 0;
}
sr->u.scan_request->responsePosition = odr_intdup(out, pos);
static int send_SRW_searchRequest(const char *arg)
{
Z_SRW_PDU *sr = 0;
-
+
if (!srw_sr)
{
assert(srw_sr_odr_out == 0);
setno = 1;
/* save this for later .. when fetching individual records */
- srw_sr = yaz_srw_get(srw_sr_odr_out, Z_SRW_searchRetrieve_request);
-
+ srw_sr = yaz_srw_get_pdu(srw_sr_odr_out, Z_SRW_searchRetrieve_request,
+ sru_version);
+
/* regular request .. */
- sr = yaz_srw_get(out, Z_SRW_searchRetrieve_request);
+ sr = yaz_srw_get_pdu(out, Z_SRW_searchRetrieve_request, sru_version);
switch(queryType)
{
sr->u.request->query.pqf = encode_SRW_term(srw_sr_odr_out, arg);
break;
default:
- printf ("Only CQL and PQF supported in SRW\n");
+ 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_size == 1 && recordsyntax_list[0] == VAL_TEXT_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);
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",
+ printf("Can't convert CQL to PQF: %s (addinfo=%s)\n",
cql_strerror(error), addinfo);
return 0;
}
myQueryType = QueryType_Prefix;
}
- req->referenceId = set_refid (out);
+ req->referenceId = set_refid(out);
if (!strcmp(arg, "@big")) /* strictly for troublemaking */
{
static unsigned char big[2100];
bigo.buf = big;
req->referenceId = &bigo;
}
-
+
if (setnumber >= 0)
{
sprintf(setstring, "%d", ++setnumber);
if (smallSetUpperBound > 0 || (largeSetLowerBound > 1 &&
mediumSetPresentNumber > 0))
{
- if (recordsyntax_size > 0)
+ if (recordsyntax_size)
req->preferredRecordSyntax =
- yaz_oidval_to_z3950oid(out, CLASS_RECSYN, recordsyntax_list[0]);
+ yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_RECSYN, recordsyntax_list[0], out);
+
req->smallSetElementSetNames =
req->mediumSetElementSetNames = elementSetNames;
}
{
case QueryType_Prefix:
query.which = Z_Query_type_1;
- pqf_parser = yaz_pqf_create ();
- RPNquery = yaz_pqf_parse (pqf_parser, out, arg);
+ pqf_parser = yaz_pqf_create();
+ RPNquery = yaz_pqf_parse(pqf_parser, out, arg);
if (!RPNquery)
{
const char *pqf_msg;
size_t off;
- int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off);
+ int code = yaz_pqf_error(pqf_parser, &pqf_msg, &off);
int ioff = off;
printf("%*s^\n", ioff+4, "");
printf("Prefix query error: %s (code %d)\n", pqf_msg, code);
-
- yaz_pqf_destroy (pqf_parser);
+
+ yaz_pqf_destroy(pqf_parser);
return 0;
}
- yaz_pqf_destroy (pqf_parser);
+ yaz_pqf_destroy(pqf_parser);
+ query_charset_convert(RPNquery);
query.u.type_1 = RPNquery;
break;
case QueryType_CCL:
RPNquery = ccl_rpn_query(out, rpn);
if (!RPNquery)
{
- printf ("Couldn't convert from CCL to RPN\n");
+ printf("Couldn't convert from CCL to RPN\n");
return 0;
}
+ query_charset_convert(RPNquery);
query.u.type_1 = RPNquery;
- ccl_rpn_delete (rpn);
+ ccl_rpn_delete(rpn);
break;
case QueryType_CQL:
query.which = Z_Query_type_104;
query.u.type_104 = ext;
break;
default:
- printf ("Unsupported query type\n");
+ printf("Unsupported query type\n");
return 0;
}
if (send_apdu(apdu))
}
/* display Query Expression as part of searchResult-1 */
-static void display_queryExpression (const char *lead, Z_QueryExpression *qe)
+static void display_queryExpression(const char *lead, Z_QueryExpression *qe)
{
if (!qe)
return;
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(ODR_INT_PRINTF, *term->u.numeric);
break;
case Z_Term_null:
- printf ("null");
+ printf("null");
break;
}
}
}
/* see if we can find USR:SearchResult-1 */
-static void display_searchResult (Z_OtherInformation *o)
+static void display_searchResult(Z_OtherInformation *o)
{
int i;
if (!o)
if (o->list[i]->which == Z_OtherInfo_externallyDefinedInfo)
{
Z_External *ext = o->list[i]->information.externallyDefinedInfo;
-
+
if (ext->which == Z_External_searchResult1)
{
int j;
Z_SearchInfoReport *sr = ext->u.searchResult1;
- printf ("SearchResult-1:");
+ printf("SearchResult-1:");
for (j = 0; j < sr->num; j++)
{
if (j)
display_queryExpression("recommendation",
sr->elements[j]->subqueryRecommendation);
if (sr->elements[j]->subqueryCount)
- printf(" cnt=%d", *sr->elements[j]->subqueryCount);
+ printf(" cnt=" ODR_INT_PRINTF,
+ *sr->elements[j]->subqueryCount);
if (sr->elements[j]->subqueryId)
printf(" id=%s ", sr->elements[j]->subqueryId);
}
- printf ("\n");
+ printf("\n");
}
}
}
static int process_searchResponse(Z_SearchResponse *res)
{
- printf ("Received SearchResponse.\n");
- print_refid (res->referenceId);
+ printf("Received SearchResponse.\n");
+ print_refid(res->referenceId);
if (*res->searchStatus)
printf("Search was a success.\n");
else
printf("Search was a bloomin' failure.\n");
- printf("Number of hits: %d", *res->resultCount);
+ printf("Number of hits: " ODR_INT_PRINTF, *res->resultCount);
last_hit_count = *res->resultCount;
if (setnumber >= 0)
- printf (", setno %d", setnumber);
- printf ("\n");
- display_searchResult (res->additionalSearchInfo);
- printf("records returned: %d\n",
+ printf(", setno %d", setnumber);
+ 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(ODR_INT_PRINTF, *res->resultSetStatus);
+ }
+ putchar('\n');
+ }
+ display_searchResult(res->additionalSearchInfo);
+ printf("records returned: " ODR_INT_PRINTF "\n",
*res->numberOfRecordsReturned);
setno += *res->numberOfRecordsReturned;
if (res->records)
printf(" ");
}
-static void print_int(int iLevel, const char *pTag, int *pInt)
+static void print_int(int iLevel, const char *pTag, Odr_int *pInt)
+{
+ if (pInt != NULL)
+ {
+ print_level(iLevel);
+ printf("%s: " ODR_INT_PRINTF "\n", pTag, *pInt);
+ }
+}
+
+static void print_bool(int iLevel, const char *pTag, Odr_bool *pInt)
{
if (pInt != NULL)
{
{
if (pOid != NULL)
{
- int *pInt = pOid;
+ Odr_oid *pInt = pOid;
print_level(iLevel);
printf("%s:", pTag);
case Z_StringOrNumeric_string:
print_string(iLevel, pTag, pStringNumeric->u.string);
break;
-
+
case Z_StringOrNumeric_numeric:
print_int(iLevel, pTag, pStringNumeric->u.numeric);
break;
-
+
default:
print_level(iLevel);
printf("%s: valid type for Z_StringOrNumeric\n", pTag);
print_universe_report_hits(iLevel,
pUniverseReport->u.databaseHits);
break;
-
+
case Z_UniverseReport_duplicate:
print_universe_report_duplicate(iLevel,
pUniverseReport->u.duplicate);
break;
-
+
default:
print_level(iLevel);
printf("Type: %d\n", pUniverseReport->which);
case Z_External_universeReport:
print_universe_report(iLevel, pExternal->u.universeReport);
break;
-
+
default:
print_level(iLevel);
printf("Type: %d\n", pExternal->which);
}
}
-static int process_resourceControlRequest (Z_ResourceControlRequest *req)
+static int process_resourceControlRequest(Z_ResourceControlRequest *req)
{
- printf ("Received ResourceControlRequest.\n");
+ printf("Received ResourceControlRequest.\n");
print_referenceId(1, req->referenceId);
- print_int(1, "Suspended Flag", req->suspendedFlag);
+ print_bool(1, "Suspended Flag", req->suspendedFlag);
print_int(1, "Partial Results Available", req->partialResultsAvailable);
- print_int(1, "Response Required", req->responseRequired);
- print_int(1, "Triggered Request Flag", req->triggeredRequestFlag);
+ print_bool(1, "Response Required", req->responseRequired);
+ print_bool(1, "Triggered Request Flag", req->triggeredRequestFlag);
print_external(1, req->resourceReport);
return 0;
}
switch (*res->operationStatus)
{
case Z_ExtendedServicesResponse_done:
- printf ("done\n");
+ printf("done\n");
break;
case Z_ExtendedServicesResponse_accepted:
- printf ("accepted\n");
+ printf("accepted\n");
break;
case Z_ExtendedServicesResponse_failure:
- printf ("failure\n");
+ printf("failure\n");
display_diagrecs(res->diagnostics, res->num_diagnostics);
break;
default:
- printf ("unknown\n");
+ printf("unknown\n");
}
if ( (*res->operationStatus != Z_ExtendedServicesResponse_failure) &&
(res->num_diagnostics != 0) ) {
display_diagrecs(res->diagnostics, res->num_diagnostics);
}
print_refid (res->referenceId);
- if (res->taskPackage &&
+ if (res->taskPackage &&
res->taskPackage->which == Z_External_extendedService)
{
Z_TaskPackage *taskPackage = res->taskPackage->u.extendedService;
Odr_oct *id = taskPackage->targetReference;
Z_External *ext = taskPackage->taskSpecificParameters;
-
+
if (id)
{
- printf ("Target Reference: ");
+ printf("Target Reference: ");
print_stringn (id->buf, id->len);
- printf ("\n");
+ printf("\n");
}
if (ext->which == Z_External_update)
{
Z_IUTaskPackageRecordStructure *tpr =
targetPart->taskPackageRecords[i];
- printf ("task package record %d\n", i+1);
+ printf("task package record %d\n", i+1);
if (tpr->which == Z_IUTaskPackageRecordStructure_record)
{
display_record (tpr->u.record);
}
else
{
- printf ("other type\n");
+ printf("other type\n");
+ }
+ }
+ }
+ }
+ if (ext->which == Z_External_itemOrder)
+ {
+ Z_IOTaskPackage *otp = ext->u.itemOrder->u.taskPackage;
+
+ if (otp && otp->targetPart)
+ {
+ if (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);
+ }
+ }
+ else if (otp->targetPart->statusOrErrorReport)
+ {
+ Z_External *ext = otp->targetPart->statusOrErrorReport;
+ if (ext->which == Z_External_octet)
+ {
+ Odr_oct *doc = ext->u.octet_aligned;
+ printf("Got Status or Error Report doc %.*s\n",
+ doc->len, doc->buf);
}
}
}
}
}
-const char *get_ill_element (void *clientData, const char *element)
+const char *get_ill_element(void *clientData, const char *element)
{
return 0;
}
ctl.odr = out;
ctl.clientData = 0;
ctl.f = get_ill_element;
-
+
req = ill_get_ItemRequest(&ctl, "ill", 0);
if (!req)
- printf ("ill_get_ItemRequest failed\n");
-
- if (!ill_ItemRequest (out, &req, 0, 0))
+ printf("ill_get_ItemRequest failed\n");
+
+ if (!ill_ItemRequest(out, &req, 0, 0))
{
if (apdu_file)
{
item_request_buf = odr_getbuf (out, &item_request_size, 0);
if (item_request_buf)
odr_setbuf (out, item_request_buf, item_request_size, 1);
- printf ("Couldn't encode ItemRequest, size %d\n", item_request_size);
+ printf("Couldn't encode ItemRequest, size %d\n", item_request_size);
return 0;
}
else
{
- oident oid;
-
- item_request_buf = odr_getbuf (out, &item_request_size, 0);
- oid.proto = PROTO_GENERAL;
- oid.oclass = CLASS_GENERAL;
- oid.value = VAL_ISO_ILL_1;
-
- r = (Z_External *) odr_malloc (out, sizeof(*r));
- r->direct_reference = odr_oiddup(out,oid_getoidbyent(&oid));
+ r = (Z_External *) odr_malloc(out, sizeof(*r));
+ 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 = (Odr_oct *)
- odr_malloc (out, sizeof(*r->u.single_ASN1_type));
+ odr_malloc(out, sizeof(*r->u.single_ASN1_type));
r->u.single_ASN1_type->buf = (unsigned char *)
- odr_malloc (out, item_request_size);
+ odr_malloc(out, item_request_size);
r->u.single_ASN1_type->len = item_request_size;
r->u.single_ASN1_type->size = item_request_size;
- memcpy (r->u.single_ASN1_type->buf, item_request_buf,
+ memcpy(r->u.single_ASN1_type->buf, item_request_buf,
item_request_size);
-
+
do_hex_dump(item_request_buf,item_request_size);
}
return r;
Z_External *r = 0;
int ill_request_size = 0;
char *ill_request_buf = 0;
-
+
ctl.odr = out;
ctl.clientData = 0;
ctl.f = get_ill_element;
{
if (apdu_file)
{
- printf ("-------------------\n");
+ printf("-------------------\n");
ill_APDU(print, &ill_apdu, 0, 0);
odr_reset(print);
- printf ("-------------------\n");
+ printf("-------------------\n");
}
ill_request_buf = odr_getbuf (out, &ill_request_size, 0);
if (ill_request_buf)
odr_setbuf (out, ill_request_buf, ill_request_size, 1);
- printf ("Couldn't encode ILL-Request, size %d\n", ill_request_size);
+ printf("Couldn't encode ILL-Request, size %d\n", ill_request_size);
return 0;
}
else
{
- oident oid;
ill_request_buf = odr_getbuf (out, &ill_request_size, 0);
-
- oid.proto = PROTO_GENERAL;
- oid.oclass = CLASS_GENERAL;
- oid.value = VAL_ISO_ILL_1;
-
- r = (Z_External *) odr_malloc (out, sizeof(*r));
- r->direct_reference = odr_oiddup(out,oid_getoidbyent(&oid));
+
+ r = (Z_External *) odr_malloc(out, sizeof(*r));
+ 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 = (Odr_oct *)
- odr_malloc (out, sizeof(*r->u.single_ASN1_type));
+ odr_malloc(out, sizeof(*r->u.single_ASN1_type));
r->u.single_ASN1_type->buf = (unsigned char *)
- odr_malloc (out, ill_request_size);
+ odr_malloc(out, ill_request_size);
r->u.single_ASN1_type->len = ill_request_size;
r->u.single_ASN1_type->size = ill_request_size;
- memcpy (r->u.single_ASN1_type->buf, ill_request_buf, ill_request_size);
-/* printf ("len = %d\n", ill_request_size); */
+ 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"); */
}
-static Z_External *create_ItemOrderExternal(const char *type, int itemno)
+static Z_External *create_ItemOrderExternal(const char *type, int itemno,
+ const char *xml_buf,
+ int xml_len)
{
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;
memset(r->u.itemOrder, 0, sizeof(Z_ItemOrder));
r->u.itemOrder->which=Z_IOItemOrder_esRequest;
- r->u.itemOrder->u.esRequest = (Z_IORequest *)
+ r->u.itemOrder->u.esRequest = (Z_IORequest *)
odr_malloc(out,sizeof(Z_IORequest));
memset(r->u.itemOrder->u.esRequest, 0, sizeof(Z_IORequest));
r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->resultSetId = "1";
r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item =
- (int *) odr_malloc(out, sizeof(int));
- *r->u.itemOrder->u.esRequest->notToKeep->resultSetItem->item = itemno;
-
+ odr_intdup(out, itemno);
if (!strcmp (type, "item") || !strcmp(type, "2"))
{
- printf ("using item-request\n");
- r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
+ printf("using item-request\n");
+ r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
create_external_itemRequest();
}
else if (!strcmp(type, "ill") || !strcmp(type, "1"))
{
- printf ("using ILL-request\n");
- r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
+ printf("using ILL-request\n");
+ r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
create_external_ILL_APDU(ILL_APDU_ILL_Request);
}
else if (!strcmp(type, "xml") || !strcmp(type, "3"))
{
- const char *xml_buf =
- "<itemorder>\n"
- " <type>request</type>\n"
- " <libraryNo>000200</libraryNo>\n"
- " <borrowerTicketNo> 1212 </borrowerTicketNo>\n"
- "</itemorder>";
- r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
- z_ext_record (out, VAL_TEXT_XML, xml_buf, strlen(xml_buf));
+ printf("using XML ILL-request\n");
+
+ if (!xml_buf)
+ {
+ printf("no docoument added\n");
+ r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0;
+ }
+ else
+ {
+ r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
+ z_ext_record_oid(out, yaz_oid_recsyn_xml, xml_buf, xml_len);
+ }
}
else
r->u.itemOrder->u.esRequest->notToKeep->itemRequest = 0;
return r;
}
-static int send_itemorder(const char *type, int itemno)
+static int send_itemorder(const char *type, int itemno,
+ const char *xml_buf, int xml_len)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest);
Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest;
- oident ItemOrderRequest;
-
req->referenceId = set_refid (out);
- ItemOrderRequest.proto = PROTO_Z3950;
- ItemOrderRequest.oclass = CLASS_EXTSERV;
- ItemOrderRequest.value = VAL_ITEMORDER;
- req->packageType = odr_oiddup(out,oid_getoidbyent(&ItemOrderRequest));
+ req->packageType = odr_oiddup(out, yaz_oid_extserv_item_order);
req->packageName = esPackageName;
- req->taskSpecificParameters = create_ItemOrderExternal(type, itemno);
-
+ req->taskSpecificParameters = create_ItemOrderExternal(type, itemno,
+ xml_buf, xml_len);
send_apdu(apdu);
return 0;
}
{
if (!conn)
{
- printf ("Not connected yet\n");
+ printf("Not connected yet\n");
return 1;
}
if (protocol == PROTO_HTTP)
{
- printf ("Not supported by SRW\n");
+ 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);
+
+#if YAZ_HAVE_XML2
+static int cmd_update_SRW(int action_no, const char *recid,
+ char *rec_buf, int rec_len);
+#endif
+
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];
+ char *action_buf;
+ int action_len;
+ char *recid_buf;
+ int recid_len;
+ const char *recid = 0;
char *rec_buf;
int rec_len;
int action_no;
int noread = 0;
- Z_External *record_this = 0;
- if (only_z3950())
- return 1;
- *action = 0;
- *recid = 0;
- sscanf (arg, "%19s %19s%n", action, recid, &noread);
- if (noread == 0)
+ if (parse_cmd_doc(&arg, out, &action_buf, &action_len) == 0)
{
- printf("Update must be followed by action and recid\n");
+ printf("Use: update action recid [fname]\n");
printf(" where action is one of insert,replace,delete.update\n");
- printf(" recid is some record ID (any string)\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 (parse_cmd_doc(&arg, out, &recid_buf, &recid_len) == 0)
+ {
+ printf("Missing recid\n");
return 0;
}
- if (!strcmp (action, "insert"))
+ if (!strcmp(action_buf, "insert"))
action_no = Z_IUOriginPartToKeep_recordInsert;
- else if (!strcmp (action, "replace"))
+ else if (!strcmp(action_buf, "replace"))
action_no = Z_IUOriginPartToKeep_recordReplace;
- else if (!strcmp (action, "delete"))
+ else if (!strcmp(action_buf, "delete"))
action_no = Z_IUOriginPartToKeep_recordDelete;
- else if (!strcmp (action, "update"))
+ else if (!strcmp(action_buf, "update"))
action_no = Z_IUOriginPartToKeep_specialUpdate;
- else
+ else
{
- printf ("Bad action: %s\n", action);
- printf ("Possible values: insert, replace, delete, update\n");
+ printf("Bad action: %s\n", action_buf);
+ printf("Possible values: insert, replace, delete, update\n");
return 0;
}
+ if (strcmp(recid_buf, "none")) /* none means no record ID */
+ recid = recid_buf;
+
arg += noread;
- if (parse_cmd_doc(&arg, out, &rec_buf, &rec_len, 1) == 0)
+ if (parse_cmd_doc(&arg, out, &rec_buf, &rec_len) == 0)
return 0;
- if (rec_buf)
- record_this = z_ext_record (out, VAL_TEXT_XML, rec_buf, rec_len);
+#if YAZ_HAVE_XML2
+ if (protocol == PROTO_HTTP)
+ return cmd_update_SRW(action_no, recid_buf, rec_buf, rec_len);
+#endif
+ return cmd_update_Z3950(version, action_no, recid_buf, 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)
+ session_connect(cur_host);
+ 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;
+ }
+ if (rec_buf)
+ {
+ 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)
{
- printf ("No last record (update ignored)\n");
+ printf("No last record (update ignored)\n");
return 0;
}
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;
-
+
req->referenceId = set_refid (out);
r = req->taskSpecificParameters = (Z_External *)
- odr_malloc (out, sizeof(*r));
+ odr_malloc(out, sizeof(*r));
r->direct_reference = req->packageType;
r->indirect_reference = 0;
r->descriptor = 0;
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;
+ if (record_schema)
+ {
+ toKeep->schema = yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_SCHEMA,
+ record_schema, out);
+ }
toKeep->elementSetName = 0;
- toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));
- *toKeep->action = action_no;
-
+ toKeep->action = odr_intdup(out, 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[0] = (Z_IU0SuppliedRecords_elem *)
odr_malloc(out, sizeof(**notToKeep->elements));
notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque;
- if (*recid && strcmp(recid, "none"))
+ if (recid)
{
notToKeep->elements[0]->u.opaque = (Odr_oct *)
- odr_malloc (out, sizeof(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);
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;
+ if (record_schema)
+ {
+ toKeep->schema = yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_SCHEMA,
+ record_schema, out);
+ }
toKeep->elementSetName = 0;
toKeep->actionQualifier = 0;
- toKeep->action = (int *) odr_malloc(out, sizeof(*toKeep->action));
- *toKeep->action = action_no;
+ toKeep->action = odr_intdup(out, action_no);
notToKeep = r->u.update->u.esRequest->notToKeep = (Z_IUSuppliedRecords *)
odr_malloc(out, sizeof(*r->u.update->u.esRequest->notToKeep));
notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *)
odr_malloc(out, sizeof(**notToKeep->elements));
notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque;
- if (*recid)
+ if (recid)
{
notToKeep->elements[0]->u.opaque = (Odr_oct *)
- odr_malloc (out, sizeof(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);
notToKeep->elements[0]->correlationInfo = 0;
notToKeep->elements[0]->record = record_this;
}
-
+
send_apdu(apdu);
return 2;
{
char *asn_buf = 0;
int noread = 0;
+ Odr_oid *oid;
char oid_str[51];
- int oid_value_xmles = VAL_XMLES;
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));
+ ext->u.single_ASN1_type = (Odr_oct *) odr_malloc(out, sizeof(Odr_oct));
sscanf(arg, "%50s%n", oid_str, &noread);
if (noread == 0)
{
return 0;
}
arg += noread;
- oid_value_xmles = oid_getvalbyname(oid_str);
- if (oid_value_xmles == VAL_NONE)
+ if (parse_cmd_doc(&arg, out, &asn_buf,
+ &ext->u.single_ASN1_type->len) == 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;
}
- if (parse_cmd_doc(&arg, out, &asn_buf,
- &ext->u.single_ASN1_type->len, 0) == 0)
- return 0;
+ req->packageType = oid;
- ext->u.single_ASN1_type->buf = (unsigned char *) asn_buf;
+ ext->direct_reference = oid;
- req->packageType = yaz_oidval_to_z3950oid(out, CLASS_EXTSERV,
- oid_value_xmles);
-
- ext->direct_reference = yaz_oidval_to_z3950oid(out, CLASS_EXTSERV,
- oid_value_xmles);
send_apdu(apdu);
-
+
return 2;
}
}
{
char type[12];
int itemno;
-
+ char *xml_buf = 0;
+ int xml_len = 0;
+ int no_read = 0;
+
if (only_z3950())
return 1;
- if (sscanf (arg, "%10s %d", type, &itemno) != 2)
+ if (sscanf(arg, "%10s %d%n", type, &itemno, &no_read) < 2)
return 0;
+ arg += no_read;
+ parse_cmd_doc(&arg, out, &xml_buf, &xml_len);
- printf("Item order request\n");
fflush(stdout);
- send_itemorder(type, itemno);
+ send_itemorder(type, itemno, xml_buf, xml_len);
return 2;
}
static void show_opt(const char *arg, void *clientData)
{
- printf ("%s ", arg);
+ printf("%s ", arg);
}
static int cmd_zversion(const char *arg)
if (*arg && arg)
z3950_version = atoi(arg);
else
- printf ("version is %d\n", z3950_version);
+ printf("version is %d\n", z3950_version);
return 0;
}
else
{
yaz_init_opt_decode(&z3950_options, show_opt, 0);
- printf ("\n");
+ printf("\n");
}
return 0;
}
return 0;
#if YAZ_HAVE_XML2
if (!conn)
- cmd_open(0);
+ session_connect(cur_host);
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_size > 0 && recordsyntax_list[0] == VAL_TEXT_XML)
+ if (recordsyntax_size == 1
+ && !yaz_matchstr(recordsyntax_list[0], "xml"))
sr->u.explain_request->recordPacking = "xml";
send_srw(sr);
return 2;
{
if (*arg)
{
- strncpy (cur_host, arg, sizeof(cur_host)-1);
+ strncpy(cur_host, arg, sizeof(cur_host)-1);
cur_host[sizeof(cur_host)-1] = 0;
}
if (only_z3950())
if (!*arg)
{
printf("SRU method is: %s\n", sru_method);
+ printf("SRU version is: %s\n", sru_version);
}
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
+ int r;
+ r = sscanf(arg, "%9s %9s", sru_method, sru_version);
+ if (r >= 1)
{
- printf("Unknown SRU method: %s\n", arg);
- printf("Specify one of POST, GET, SOAP\n");
+ if (!yaz_matchstr(sru_method, "post"))
+ ;
+ else if (!yaz_matchstr(sru_method, "get"))
+ ;
+ else if (!yaz_matchstr(sru_method, "soap"))
+ ;
+ else
+ {
+ strcpy(sru_method, "soap");
+ printf("Unknown SRU method: %s\n", arg);
+ printf("Specify one of POST, GET, SOAP\n");
+ }
}
}
return 0;
{
#if YAZ_HAVE_XML2
if (!conn)
- cmd_open(0);
+ session_connect(cur_host);
if (!conn)
return 0;
if (!send_SRW_searchRequest(arg))
}
else
{
- if (!conn)
+ if (*cur_host && auto_reconnect)
{
- try_reconnect();
-
- if (!conn) {
- printf("Not connected yet\n");
- return 0;
+ int i = 0;
+ for (;;)
+ {
+ if (conn)
+ {
+ if (!send_searchRequest(arg))
+ return 0;
+ wait_and_handle_response(0);
+ if (conn)
+ break;
+ }
+ if (++i == 2)
+ {
+ printf("Unable to reconnect\n");
+ break;
+ }
+ session_connect(cur_host);
+ wait_and_handle_response(0);
}
+ return 0;
+ }
+ else if (conn)
+ {
+ if (!send_searchRequest(arg))
+ return 0;
}
- if (!send_searchRequest(arg))
+ else
+ {
+ printf("Not connected yet\n");
return 0;
+ }
}
return 2;
}
setnumber = 0;
else
setnumber = -1;
-
+
if (setnumber >= 0)
printf("Set numbering enabled.\n");
else
/* PRESENT SERVICE ----------------------------- */
static void parse_show_args(const char *arg_c, char *setstring,
- int *start, int *number)
+ Odr_int *start, Odr_int *number)
{
char arg[40];
char *p;
*start = atoi(arg);
}
if (p && (p=strchr(p+1, '+')))
- strcpy (setstring, p+1);
+ strcpy(setstring, p+1);
else if (setnumber >= 0)
sprintf(setstring, "%d", setnumber);
else
Z_APDU *apdu = zget_APDU(out, Z_APDU_presentRequest);
Z_PresentRequest *req = apdu->u.presentRequest;
Z_RecordComposition compo;
- int nos = 1;
+ Odr_int nos = 1;
char setstring[100];
- req->referenceId = set_refid (out);
+ req->referenceId = set_refid(out);
parse_show_args(arg, setstring, &setno, &nos);
if (*setstring)
req->resultSetStartPoint = &setno;
req->numberOfRecordsRequested = &nos;
- if (recordsyntax_size == 1)
+ if (recordsyntax_size)
req->preferredRecordSyntax =
- yaz_oidval_to_z3950oid(out, CLASS_RECSYN, recordsyntax_list[0]);
+ yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_RECSYN, recordsyntax_list[0], out);
if (record_schema || recordsyntax_size >= 2)
{
compo.which = Z_RecordComp_complex;
compo.u.complex = (Z_CompSpec *)
odr_malloc(out, sizeof(*compo.u.complex));
- compo.u.complex->selectAlternativeSyntax = (bool_t *)
+ compo.u.complex->selectAlternativeSyntax = (bool_t *)
odr_malloc(out, sizeof(bool_t));
*compo.u.complex->selectAlternativeSyntax = 0;
compo.u.complex->generic = (Z_Specification *)
odr_malloc(out, sizeof(*compo.u.complex->generic));
-
+
compo.u.complex->generic->which = Z_Schema_oid;
if (!record_schema)
compo.u.complex->generic->schema.oid = 0;
- else
+ else
{
compo.u.complex->generic->schema.oid =
- yaz_str_to_z3950oid(out, CLASS_SCHEMA, record_schema);
-
+ 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_str_to_z3950oid(out, CLASS_RECSYN, record_schema);
+ yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_RECSYN, record_schema, out);
}
}
if (!elementSetNames)
}
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->recordSyntax = (Odr_oid **)
odr_malloc(out, recordsyntax_size * sizeof(Odr_oid*));
for (i = 0; i < recordsyntax_size; i++)
- compo.u.complex->recordSyntax[i] =
- yaz_oidval_to_z3950oid(out, CLASS_RECSYN,
- recordsyntax_list[i]);
- }
- else
- {
- compo.u.complex->num_recordSyntax = 0;
- compo.u.complex->recordSyntax = 0;
+ compo.u.complex->recordSyntax[i] =
+ yaz_string_to_oid_odr(yaz_oid_std(),
+ CLASS_RECSYN, recordsyntax_list[i], out);
}
}
else if (elementSetNames)
compo.u.simple = elementSetNames;
}
send_apdu(apdu);
- printf("Sent presentRequest (%d+%d).\n", setno, nos);
+ printf("Sent presentRequest (" ODR_INT_PRINTF "+" ODR_INT_PRINTF ").\n",
+ setno, nos);
return 2;
}
static int send_SRW_presentRequest(const char *arg)
{
char setstring[100];
- int nos = 1;
+ Odr_int nos = 1;
Z_SRW_PDU *sr = srw_sr;
if (!sr)
sr->u.request->maximumRecords = odr_intdup(out, nos);
if (record_schema)
sr->u.request->recordSchema = record_schema;
- if (recordsyntax_size == 1 && recordsyntax_list[0] == VAL_TEXT_XML)
+ if (recordsyntax_size == 1 && !yaz_matchstr(recordsyntax_list[0], "xml"))
sr->u.request->recordPacking = "xml";
return send_srw(sr);
}
#endif
-static void close_session (void)
+static void close_session(void)
{
if (conn)
- cs_close (conn);
+ cs_close(conn);
conn = 0;
sent_close = 0;
odr_reset(out);
printf("Reason: %s, message: %s\n", reasons[*req->closeReason],
req->diagnosticInformation ? req->diagnosticInformation : "NULL");
if (sent_close)
- close_session ();
+ close_session();
else
{
*res->closeReason = Z_Close_finished;
{
#if YAZ_HAVE_XML2
if (!conn)
- cmd_open(0);
+ session_connect(cur_host);
if (!conn)
return 0;
if (!send_SRW_presentRequest(arg))
return 2;
}
+void exit_client(int code)
+{
+ file_history_save(file_history);
+ file_history_destroy(&file_history);
+ nmem_destroy(nmem_auth);
+ exit(code);
+}
+
int cmd_quit(const char *arg)
{
printf("See you later, alligator.\n");
- xmalloc_trav ("");
- exit(0);
+ xmalloc_trav("");
+ exit_client(0);
return 0;
}
apdu->u.triggerResourceControlRequest;
bool_t rfalse = 0;
char command[16];
-
+
*command = '\0';
sscanf(arg, "%15s", command);
}
*req->requestedAction = Z_TriggerResourceControlRequest_cancel;
req->resultSetWanted = &rfalse;
- req->referenceId = set_refid (out);
+ req->referenceId = set_refid(out);
send_apdu(apdu);
printf("Sent cancel request\n");
return fres;
}
-int send_scanrequest(const char *query, int pp, int num, const char *term)
+int send_scanrequest(const char *set, const char *query,
+ Odr_int pp, Odr_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;
if (queryType == QueryType_CCL2RPN)
int error, pos;
struct ccl_rpn_node *rpn;
- rpn = ccl_find_str (bibset, query, &error, &pos);
+ rpn = ccl_find_str(bibset, query, &error, &pos);
if (error)
{
printf("CCL ERROR: %s\n", ccl_err_msg(error));
return -1;
}
req->attributeSet =
- yaz_oidval_to_z3950oid(out, CLASS_ATTSET, VAL_BIB1);
- if (!(req->termListAndStartPoint = ccl_scan_query (out, rpn)))
+ 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");
return -1;
}
- ccl_rpn_delete (rpn);
+ ccl_rpn_delete(rpn);
}
else
{
- YAZ_PQF_Parser pqf_parser = yaz_pqf_create ();
+ YAZ_PQF_Parser pqf_parser = yaz_pqf_create();
if (!(req->termListAndStartPoint =
yaz_pqf_scan(pqf_parser, out, &req->attributeSet, query)))
{
const char *pqf_msg;
size_t off;
- int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off);
+ int code = yaz_pqf_error(pqf_parser, &pqf_msg, &off);
int ioff = off;
printf("%*s^\n", ioff+7, "");
printf("Prefix query error: %s (code %d)\n", pqf_msg, code);
- yaz_pqf_destroy (pqf_parser);
+ 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_pqf_destroy (pqf_parser);
+ yaz_query_charset_convert_apt(req->termListAndStartPoint, out, cd);
+ yaz_iconv_close(cd);
}
if (term && *term)
{
strlen(term);
}
}
- req->referenceId = set_refid (out);
+ req->referenceId = set_refid(out);
req->num_databaseNames = num_databaseNames;
req->databaseNames = databaseNames;
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;
}
Z_APDU *apdu = zget_APDU(out, Z_APDU_sortRequest);
Z_SortRequest *req = apdu->u.sortRequest;
Z_SortKeySpecList *sksl = (Z_SortKeySpecList *)
- odr_malloc (out, sizeof(*sksl));
+ odr_malloc(out, sizeof(*sksl));
char setstring[32];
if (only_z3950())
return 0;
if (setnumber >= 0)
- sprintf (setstring, "%d", setnumber);
+ sprintf(setstring, "%d", setnumber);
else
- sprintf (setstring, "default");
+ sprintf(setstring, "default");
- req->referenceId = set_refid (out);
+ req->referenceId = set_refid(out);
req->num_inputResultSetNames = 1;
req->inputResultSetNames = (Z_InternationalString **)
- odr_malloc (out, sizeof(*req->inputResultSetNames));
- req->inputResultSetNames[0] = odr_strdup (out, setstring);
+ odr_malloc(out, sizeof(*req->inputResultSetNames));
+ req->inputResultSetNames[0] = odr_strdup(out, setstring);
if (newset && setnumber >= 0)
- sprintf (setstring, "%d", ++setnumber);
+ sprintf(setstring, "%d", ++setnumber);
- req->sortedResultSetName = odr_strdup (out, setstring);
+ req->sortedResultSetName = odr_strdup(out, setstring);
- req->sortSequence = yaz_sort_spec (out, arg);
+ req->sortSequence = yaz_sort_spec(out, arg);
if (!req->sortSequence)
{
- printf ("Missing sort specifications\n");
+ printf("Missing sort specifications\n");
return -1;
}
send_apdu(apdu);
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);
+ printf(" (" ODR_INT_PRINTF ")\n", *t->globalOccurrences);
else
- printf ("\n");
+ printf("\n");
}
void process_scanResponse(Z_ScanResponse *res)
int i;
Z_Entry **entries = NULL;
int num_entries = 0;
-
- printf("Received ScanResponse\n");
- print_refid (res->referenceId);
- printf("%d entries", *res->numberOfEntriesReturned);
+
+ printf("Received ScanResponse\n");
+ print_refid(res->referenceId);
+ printf(ODR_INT_PRINTF " entries", *res->numberOfEntriesReturned);
if (res->positionOfTerm)
- printf (", position=%d", *res->positionOfTerm);
- printf ("\n");
+ printf(", position=" ODR_INT_PRINTF, *res->positionOfTerm);
+ printf("\n");
if (*res->scanStatus != Z_Scan_success)
- printf("Scan returned code %d\n", *res->scanStatus);
+ printf("Scan returned code " ODR_INT_PRINTF "\n", *res->scanStatus);
if (!res->entries)
return;
if ((entries = res->entries->entries))
display_diagrecs(&entries[i]->u.surrogateDiagnostic, 1);
}
if (res->entries->nonsurrogateDiagnostics)
- display_diagrecs (res->entries->nonsurrogateDiagnostics,
+ display_diagrecs(res->entries->nonsurrogateDiagnostics,
res->entries->num_nonsurrogateDiagnostics);
}
switch (*res->sortStatus)
{
case Z_SortResponse_success:
- printf ("success"); break;
+ printf("success"); break;
case Z_SortResponse_partial_1:
- printf ("partial"); break;
+ printf("partial"); break;
case Z_SortResponse_failure:
- printf ("failure"); break;
+ printf("failure"); break;
default:
- printf ("unknown (%d)", *res->sortStatus);
+ printf("unknown (" ODR_INT_PRINTF ")", *res->sortStatus);
}
- printf ("\n");
+ printf("\n");
print_refid (res->referenceId);
if (res->diagnostics)
display_diagrecs(res->diagnostics,
res->num_diagnostics);
}
-void process_deleteResultSetResponse (Z_DeleteResultSetResponse *res)
+void process_deleteResultSetResponse(Z_DeleteResultSetResponse *res)
{
- printf("Got deleteResultSetResponse status=%d\n",
+ printf("Got deleteResultSetResponse status=" ODR_INT_PRINTF "\n",
*res->deleteOperationStatus);
if (res->deleteListStatuses)
{
int i;
for (i = 0; i < res->deleteListStatuses->num; i++)
{
- printf ("%s status=%d\n", res->deleteListStatuses->elements[i]->id,
- *res->deleteListStatuses->elements[i]->status);
+ printf("%s status=" ODR_INT_PRINTF "\n",
+ res->deleteListStatuses->elements[i]->id,
+ *res->deleteListStatuses->elements[i]->status);
}
}
}
{
if (only_z3950())
return 0;
- if (session_initResponse &&
+ if (session_initResponse &&
!ODR_MASK_GET(session_initResponse->options, Z_Options_sort))
{
printf("Target doesn't support sort\n");
int cmd_sort(const char *arg)
{
- return cmd_sort_generic (arg, 0);
+ return cmd_sort_generic(arg, 0);
}
-int cmd_sort_newset (const char *arg)
+int cmd_sort_newset(const char *arg)
{
- return cmd_sort_generic (arg, 1);
+ return cmd_sort_generic(arg, 1);
}
int cmd_scanstep(const char *arg)
return 0;
}
-int cmd_scan(const char *arg)
+static int cmd_scan_common(const char *set, const char *arg)
{
if (protocol == PROTO_HTTP)
{
#if YAZ_HAVE_XML2
if (!conn)
- cmd_open(0);
+ session_connect(cur_host);
if (!conn)
return 0;
if (*arg)
}
else
{
- if (!conn)
+ if (*cur_host && !conn && auto_reconnect)
{
- try_reconnect();
-
- if (!conn) {
- printf("Session not initialized yet\n");
- return 0;
- }
+ session_connect(cur_host);
+ wait_and_handle_response(0);
}
- if (session_initResponse &&
+ if (!conn)
+ return 0;
+ if (session_initResponse &&
!ODR_MASK_GET(session_initResponse->options, Z_Options_scan))
{
printf("Target doesn't support scan\n");
}
if (*arg)
{
- strcpy (last_scan_query, arg);
- if (send_scanrequest(arg, scan_position, scan_size, 0) < 0)
+ strcpy(last_scan_query, arg);
+ if (send_scanrequest(set, arg,
+ scan_position, scan_size, 0) < 0)
return 0;
}
else
{
- if (send_scanrequest(last_scan_query, 1, scan_size, last_scan_line) < 0)
+ 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);
const char *cp = arg;
int nor;
int idx = 0;
- oid_value nsyntax[RECORDSYNTAX_MAX];
+ int i;
char form_str[41];
if (!arg || !*arg)
{
printf("Usage: format <recordsyntax>\n");
return 0;
}
- while (sscanf(cp, "%40s%n", form_str, &nor) >= 1 && nor > 0
+ while (sscanf(cp, "%40s%n", form_str, &nor) >= 1 && nor > 0
&& idx < RECORDSYNTAX_MAX)
{
- nsyntax[idx] = oid_getvalbyname(form_str);
- if (!strcmp(form_str, "none"))
- break;
- if (nsyntax[idx] == VAL_NONE)
+ if (strcmp(form_str, "none") &&
+ !yaz_string_to_oid_odr(yaz_oid_std(), CLASS_RECSYN, form_str, out))
{
- printf ("unknown record syntax: %s\n", form_str);
+ printf("Bad format: %s\n", form_str);
return 0;
}
cp += nor;
+ }
+ for (i = 0; i < recordsyntax_size; i++)
+ {
+ xfree(recordsyntax_list[i]);
+ recordsyntax_list[i] = 0;
+ }
+
+ cp = arg;
+ 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;
- memcpy(recordsyntax_list, nsyntax, idx * sizeof(*nsyntax));
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)
+int cmd_querytype(const char *arg)
{
- if (!strcmp (arg, "ccl"))
+ if (!strcmp(arg, "ccl"))
queryType = QueryType_CCL;
- else if (!strcmp (arg, "prefix") || !strcmp(arg, "rpn"))
+ else if (!strcmp(arg, "prefix") || !strcmp(arg, "rpn"))
queryType = QueryType_Prefix;
- else if (!strcmp (arg, "ccl2rpn") || !strcmp (arg, "cclrpn"))
+ else if (!strcmp(arg, "ccl2rpn") || !strcmp(arg, "cclrpn"))
queryType = QueryType_CCL2RPN;
else if (!strcmp(arg, "cql"))
- queryType = QueryType_CQL;
- else if (!strcmp (arg, "cql2rpn") || !strcmp (arg, "cqlrpn"))
+ queryType = QueryType_CQL;
+ else if (!strcmp(arg, "cql2rpn") || !strcmp(arg, "cqlrpn"))
queryType = QueryType_CQL2RPN;
else
{
- printf ("Querytype must be one of:\n");
- printf (" prefix - Prefix query\n");
- printf (" ccl - CCL query\n");
- printf (" ccl2rpn - CCL query converted to RPN\n");
- printf (" cql - CQL\n");
- printf (" cql2rpn - CQL query converted to RPN\n");
+ printf("Querytype must be one of:\n");
+ printf(" prefix - Prefix query\n");
+ printf(" ccl - CCL query\n");
+ printf(" ccl2rpn - CCL query converted to RPN\n");
+ printf(" cql - CQL\n");
+ printf(" cql2rpn - CQL query converted to RPN\n");
return 0;
}
return 1;
}
-int cmd_refid (const char *arg)
+int cmd_refid(const char *arg)
{
- xfree (refid);
+ xfree(refid);
refid = NULL;
if (*arg)
- refid = xstrdup (arg);
+ refid = xstrdup(arg);
return 1;
}
int cmd_packagename(const char* arg)
{
- xfree (esPackageName);
+ xfree(esPackageName);
esPackageName = NULL;
if (*arg)
esPackageName = xstrdup(arg);
xfree(yazProxy);
yazProxy = 0;
if (*arg)
- yazProxy = xstrdup (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);
+ 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
{
- xfree (outputCharset);
+ xfree(outputCharset);
outputCharset = 0;
if (!strcmp(l1, "auto") && codeset)
{
if (codeset)
{
- printf ("Display character set: %s\n", codeset);
+ printf("Display character set: %s\n", codeset);
outputCharset = xstrdup(codeset);
}
else
- printf ("No codeset found on this system\n");
+ printf("No codeset found on this system\n");
}
else if (strcmp(l1, "-") && strcmp(l1, "none"))
outputCharset = xstrdup(l1);
- }
+ }
return 1;
}
if (sscanf(arg, "%29s %d %d", l1, &negotiationCharsetRecords,
&negotiationCharsetVersion) < 1)
{
- printf("Current negotiation character set is `%s'\n",
- negotiationCharset ? negotiationCharset: "none");
- printf("Records in charset %s\n", negotiationCharsetRecords ?
- "yes" : "no");
- printf("Charneg version %d\n", negotiationCharsetVersion);
+ printf("Negotiation character set `%s'\n",
+ negotiationCharset ? negotiationCharset: "none");
+ if (negotiationCharset)
+ {
+ printf("Records in charset %s\n", negotiationCharsetRecords ?
+ "yes" : "no");
+ printf("Charneg version %d\n", negotiationCharsetVersion);
+ }
}
else
{
- xfree (negotiationCharset);
+ xfree(negotiationCharset);
negotiationCharset = NULL;
if (*l1 && strcmp(l1, "-") && strcmp(l1, "none"))
{
negotiationCharset = xstrdup(l1);
- printf ("Character set negotiation : %s\n", negotiationCharset);
+ 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_querycharset("");
}
else
{
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);
+ printf("Current language is `%s'\n", yazLang ? yazLang : "none");
return 1;
}
- xfree (yazLang);
+ xfree(yazLang);
yazLang = NULL;
if (*arg)
yazLang = xstrdup(arg);
return 1;
}
-int cmd_source(const char* arg, int echo )
+int cmd_source(const char* arg, int echo )
{
/* first should open the file and read one line at a time.. */
FILE* includeFile;
char line[102400], *cp;
- if(strlen(arg)<1) {
- fprintf(stderr,"Error in source command use a filename\n");
+ if (strlen(arg) < 1)
+ {
+ fprintf(stderr, "Error in source command use a filename\n");
return -1;
}
-
- includeFile = fopen (arg, "r");
-
- if(!includeFile) {
- fprintf(stderr,"Unable to open file %s for reading\n",arg);
+
+ includeFile = fopen(arg, "r");
+
+ if (!includeFile)
+ {
+ fprintf(stderr, "Unable to open file %s for reading\n",arg);
return -1;
}
-
- while(!feof(includeFile)) {
- memset(line,0,sizeof(line));
- fgets(line,sizeof(line),includeFile);
-
- if(strlen(line) < 2) continue;
- if(line[0] == '#') continue;
-
- if ((cp = strrchr (line, '\n')))
+
+ while (fgets(line, sizeof(line), includeFile))
+ {
+ if (strlen(line) < 2)
+ continue;
+ if (line[0] == '#')
+ continue;
+
+ 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(fclose(includeFile)<0) {
+
+ if (fclose(includeFile))
+ {
perror("unable to close include file");
exit(1);
}
}
int cmd_source_echo(const char* arg)
-{
+{
cmd_source(arg, 1);
return 1;
}
int cmd_subshell(const char* args)
{
- if(strlen(args))
- system(args);
- else
- system(getenv("SHELL"));
-
+ int ret = system(strlen(args) ? args : getenv("SHELL"));
printf("\n");
+ if (ret)
+ {
+ printf("Exit %d\n", ret);
+ }
return 1;
}
}
int cmd_set_cclfile(const char* arg)
-{
+{
FILE *inf;
- bibset = ccl_qual_mk ();
- inf = fopen (arg, "r");
+ bibset = ccl_qual_mk();
+ inf = fopen(arg, "r");
if (!inf)
perror("unable to open CCL file");
else
{
- ccl_qual_file (bibset, inf);
- fclose (inf);
+ ccl_qual_file(bibset, inf);
+ fclose(inf);
}
strcpy(ccl_fields,arg);
return 0;
}
int cmd_set_auto_reconnect(const char* arg)
-{
+{
if(strlen(arg)==0) {
auto_reconnect = ! auto_reconnect;
} 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;
}
-
+
if (auto_reconnect)
printf("Set auto reconnect enabled.\n");
else
printf("Set auto reconnect disabled.\n");
-
+
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;
+ 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;
}
return 1;
}
-/*
- this command takes 3 arge {name class oid}
+static void marc_file_write(const char *buf, size_t sz)
+{
+ if (marc_file)
+ {
+ if (fwrite(buf, 1, sz, marc_file) != sz)
+ {
+ perror("marcfile write");
+ }
+ }
+}
+/*
+ this command takes 3 arge {name class oid}
*/
int cmd_register_oid(const char* args) {
static struct {
{"general",CLASS_GENERAL},
{0,(enum oid_class) 0}
};
- char oname_str[101], oclass_str[101], oid_str[101];
- char* name;
+ char oname_str[101], oclass_str[101], oid_str[101];
int i;
oid_class oidclass = CLASS_GENERAL;
- int val = 0, oid[OID_SIZE];
- struct oident * new_oident=NULL;
-
- if (sscanf (args, "%100[^ ] %100[^ ] %100s",
+ 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;
}
-
+
for (i = 0; oid_classes[i].className; i++) {
if (!strcmp(oid_classes[i].className, oclass_str))
{
break;
}
}
-
+
if(!(oid_classes[i].className)) {
printf("Unknown oid class %s\n",oclass_str);
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;
}
-int cmd_push_command(const char* arg)
+int cmd_push_command(const char* arg)
{
#if HAVE_READLINE_HISTORY_H
- if(strlen(arg)>1)
+ if(strlen(arg)>1)
add_history(arg);
-#else
+#else
fprintf(stderr,"Not compiled with the readline/history module\n");
#endif
return 1;
}
-void source_rcfile(void)
+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 (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);
+ }
}
-
- };
-
- if(stat(".yazclientrc",&statbuf)==0) {
- cmd_source(".yazclientrc", 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;
-
+
if (!(out = odr_createmem(ODR_ENCODE)) ||
!(in = odr_createmem(ODR_DECODE)) ||
!(print = odr_createmem(ODR_PRINT)))
fprintf(stderr, "failed to allocate ODR streams\n");
exit(1);
}
- oid_init();
-
+
setvbuf(stdout, 0, _IONBF, 0);
if (apdu_file)
odr_setprint(print, apdu_file);
- bibset = ccl_qual_mk ();
- inf = fopen (ccl_fields, "r");
+ bibset = ccl_qual_mk();
+ inf = fopen(ccl_fields, "r");
if (inf)
{
- ccl_qual_file (bibset, inf);
- fclose (inf);
+ ccl_qual_file(bibset, inf);
+ fclose(inf);
}
cqltrans = cql_transform_open_fname(cql_fields);
/* 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;
+ extraOtherInfos[i].oid[0] = -1;
+ extraOtherInfos[i].value = 0;
}
-
- source_rcfile();
+
+ cmd_format("usmarc");
+
+ file_history = file_history_new();
+
+ source_rc_file(rc_file);
+
+ file_history_load(file_history);
+ file_history_trav(file_history, 0, add_to_readline_history);
}
{
if (rec->recordPosition)
{
- printf ("pos=%d", *rec->recordPosition);
+ printf("pos=" ODR_INT_PRINTF, *rec->recordPosition);
setno = *rec->recordPosition + 1;
}
if (rec->recordSchema)
- printf (" schema=%s", rec->recordSchema);
- printf ("\n");
+ 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);
+ printf("%.*s", rec->recordData_len, rec->recordData_buf);
+ marc_file_write(rec->recordData_buf, rec->recordData_len);
}
else
- printf ("No data!");
+ printf("No data!");
printf("\n");
}
{
int i;
- printf ("Received SRW SearchRetrieve Response\n");
-
+ printf("Received SRW SearchRetrieve Response\n");
+
for (i = 0; i<res->num_diagnostics; i++)
{
if (res->diagnostics[i].uri)
- printf ("SRW diagnostic %s\n",
+ printf("SRW diagnostic %s\n",
res->diagnostics[i].uri);
else
- printf ("SRW diagnostic missing or could not be decoded\n");
+ printf("SRW diagnostic missing or could not be decoded\n");
if (res->diagnostics[i].message)
- printf ("Message: %s\n", res->diagnostics[i].message);
+ printf("Message: %s\n", res->diagnostics[i].message);
if (res->diagnostics[i].details)
- printf ("Details: %s\n", res->diagnostics[i].details);
+ printf("Details: %s\n", res->diagnostics[i].details);
}
if (res->numberOfRecords)
- printf ("Number of hits: %d\n", *res->numberOfRecords);
+ printf("Number of hits: " ODR_INT_PRINTF "\n", *res->numberOfRecords);
for (i = 0; i<res->num_records; i++)
handle_srw_record(res->records + i);
}
else
printf("No value:");
if (term->numberOfRecords)
- printf(" %d", *term->numberOfRecords);
+ printf(" " ODR_INT_PRINTF, *term->numberOfRecords);
if (term->whereInList)
printf(" %s", term->whereInList);
if (term->value && term->displayTerm)
{
int i;
- printf ("Received SRW Scan Response\n");
-
+ printf("Received SRW Scan Response\n");
+
for (i = 0; i<res->num_diagnostics; i++)
{
if (res->diagnostics[i].uri)
- printf ("SRW diagnostic %s\n",
+ printf("SRW diagnostic %s\n",
res->diagnostics[i].uri);
else
- printf ("SRW diagnostic missing or could not be decoded\n");
+ printf("SRW diagnostic missing or could not be decoded\n");
if (res->diagnostics[i].message)
- printf ("Message: %s\n", res->diagnostics[i].message);
+ printf("Message: %s\n", res->diagnostics[i].message);
if (res->diagnostics[i].details)
- printf ("Details: %s\n", res->diagnostics[i].details);
+ printf("Details: %s\n", res->diagnostics[i].details);
}
if (res->terms)
for (i = 0; i<res->num_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",
+ 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",
+ printf("SOAP Fault string %s\n",
soap_package->u.fault->fault_string);
if (soap_package->u.fault->details)
- printf ("SOAP Details %s\n",
+ 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
{
- printf ("Decoding of SRW package failed\n");
+ printf("Decoding of SRW package failed\n");
}
close_session();
}
if (!connection_head || strcmp(connection_head, "Keep-Alive"))
close_session();
}
- else
+ else
{
/* HTTP 1.1: only if no close we stay alive .. */
if (connection_head && !strcmp(connection_head, "close"))
}
#endif
-void wait_and_handle_response(int one_response_only)
+static void wait_and_handle_response(int one_response_only)
{
int reconnect_ok = 1;
int res;
struct timeval tv_end;
#endif
Z_GDU *gdu;
-
+
while(conn)
{
res = cs_get(conn, &netbuffer, &netbufferlen);
{
cs_close(conn);
conn = 0;
- cmd_open(0);
+ session_connect(cur_host);
reconnect_ok = 0;
if (conn)
{
char *buf_out;
int len_out;
-
+
buf_out = odr_getbuf(out, &len_out, 0);
-
+
do_hex_dump(buf_out, len_out);
cs_put(conn, buf_out, len_out);
-
+
odr_reset(out);
continue;
}
}
#if HAVE_GETTIMEOFDAY
if (got_tv_end == 0)
- gettimeofday (&tv_end, 0); /* count first one only */
+ gettimeofday(&tv_end, 0); /* count first one only */
got_tv_end++;
#endif
odr_reset(out);
record_last = 0;
do_hex_dump(netbuffer, res);
odr_setbuf(in, netbuffer, res, 0);
-
+
if (!z_GDU(in, &gdu, 0, 0))
{
FILE *f = ber_file ? ber_file : stdout;
process_scanResponse(apdu->u.scanResponse);
break;
case Z_APDU_presentResponse:
- print_refid (apdu->u.presentResponse->referenceId);
+ print_refid(apdu->u.presentResponse->referenceId);
setno +=
*apdu->u.presentResponse->numberOfRecordsReturned;
if (apdu->u.presentResponse->records)
display_records(apdu->u.presentResponse->records);
else
printf("No records.\n");
- printf ("nextResultSetPosition = %d\n",
+ printf("nextResultSetPosition = " ODR_INT_PRINTF "\n",
*apdu->u.presentResponse->nextResultSetPosition);
break;
case Z_APDU_sortResponse:
deleteResultSetResponse);
break;
default:
- printf("Received unknown APDU type (%d).\n",
+ printf("Received unknown APDU type (%d).\n",
apdu->which);
- close_session ();
+ close_session();
}
}
#if YAZ_HAVE_XML2
if (got_tv_end)
{
#if 0
- printf ("S/U S/U=%ld/%ld %ld/%ld",
+ printf("S/U S/U=%ld/%ld %ld/%ld",
(long) tv_start.tv_sec,
(long) tv_start.tv_usec,
(long) tv_end.tv_sec,
(long) tv_end.tv_usec);
#endif
- printf ("Elapsed: %.6f\n",
+ 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
- xfree (netbuffer);
+ xfree(netbuffer);
}
-int cmd_cclparse(const char* arg)
+int cmd_cclparse(const char* arg)
{
int error, pos;
struct ccl_rpn_node *rpn=NULL;
-
-
- rpn = ccl_find_str (bibset, arg, &error, &pos);
-
+
+
+ rpn = ccl_find_str(bibset, arg, &error, &pos);
+
if (error) {
int ioff = 3+strlen(last_cmd)+1+pos;
- printf ("%*s^ - ", ioff, " ");
- printf ("%s\n", ccl_err_msg (error));
+ printf("%*s^ - ", ioff, " ");
+ printf("%s\n", ccl_err_msg(error));
}
else
{
if (rpn)
- {
- ccl_pr_tree(rpn, stdout);
+ {
+ ccl_pr_tree(rpn, stdout);
}
}
if (rpn)
ccl_rpn_delete(rpn);
-
- printf ("\n");
-
+
+ printf("\n");
+
return 0;
}
char oidstr[101], otherinfoString[101];
int otherinfoNo;
int sscan_res;
- int oidval;
-
- sscan_res = sscanf (args, "%d %100[^ ] %100s",
+
+ sscan_res = sscanf(args, "%d %100[^ ] %100s",
&otherinfoNo, oidstr, otherinfoString);
- if (sscan_res==1) {
+
+ 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)
- xfree(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 too large (%d>=%d)\n",
- otherinfoNo,maxOtherInfosSupported);
- }
-
- oidval = oid_getvalbyname (oidstr);
- if (oidval == VAL_NONE)
+ else
{
- printf("Error in set_otherinfo command unknown oid %s \n",oidstr);
- return 0;
- }
- extraOtherInfos[otherinfoNo].oidval = oidval;
- if (extraOtherInfos[otherinfoNo].value)
+ 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);
-
+ extraOtherInfos[otherinfoNo].value = xstrdup(otherinfoString);
+
+ nmem_destroy(oid_tmp);
+ }
+
return 0;
}
-int cmd_sleep(const char* args )
+int cmd_sleep(const char* args )
{
int sec=atoi(args);
if( sec > 0 ) {
#else
sleep(sec);
#endif
- printf("Done sleeping %d seconds\n", sec);
+ printf("Done sleeping %d seconds\n", sec);
}
- return 1;
+ return 1;
}
int cmd_list_otherinfo(const char* args)
{
- int i;
-
- if(strlen(args)>0) {
+ int i;
+
+ 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;
}
int cmd_list_all(const char* args) {
int i;
-
+
/* connection options */
- if(conn) {
- printf("Connected to : %s\n",last_open_command);
- } else {
- if(last_open_command)
- printf("Not connected to : %s\n",last_open_command);
- else
- printf("Not connected : \n");
-
- }
- if(yazProxy) printf("using proxy : %s\n",yazProxy);
-
+ if (conn)
+ printf("Connected to : %s\n", cur_host);
+ else if (*cur_host)
+ printf("Not connected to : %s\n", cur_host);
+ else
+ printf("Not connected : \n");
+ 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");
} else {
switch(auth->which) {
case Z_IdAuthentication_idPass:
- printf("Authentication : IdPass\n");
+ printf("Authentication : IdPass\n");
printf(" Login User : %s\n",auth->u.idPass->userId?auth->u.idPass->userId:"");
printf(" Login Group : %s\n",auth->u.idPass->groupId?auth->u.idPass->groupId:"");
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");
}
if (negotiationCharset)
printf("Neg. Character set : `%s'\n", negotiationCharset);
-
+
/* bases */
printf("Bases : ");
for (i = 0; i<num_databaseNames; i++) printf("%s ",databaseNames[i]);
printf("\n");
-
+
/* Query options */
printf("CCL file : %s\n",ccl_fields);
printf("CQL file : %s\n",cql_fields);
printf("Query type : %s\n",query_type_as_string(queryType));
-
+
printf("Named Result Sets : %s\n",setnumber==-1?"off":"on");
-
+
/* piggy back options */
printf("ssub/lslb/mspn : %d/%d/%d\n",smallSetUpperBound,largeSetLowerBound,mediumSetPresentNumber);
-
+
/* print present related options */
- printf("Format : %s\n",
- (recordsyntax_size > 0) ?
- yaz_z3950_oid_value_to_str(recordsyntax_list[0], CLASS_RECSYN) :
- "none");
+ 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:"");
-
+
/* loging options */
printf("APDU log : %s\n",apdu_file?"on":"off");
printf("Record log : %s\n",marc_file?"on":"off");
-
+
/* other infos */
printf("Other Info: \n");
cmd_list_otherinfo("");
-
+
return 0;
}
-int cmd_clear_otherinfo(const char* args)
+int cmd_clear_otherinfo(const char* args)
{
if(strlen(args)>0) {
int otherinfoNo = atoi(args);
otherinfoNo, maxOtherInfosSupported);
return 0;
}
- if (extraOtherInfos[otherinfoNo].oidval != -1)
- {
+ if (extraOtherInfos[otherinfoNo].value)
+ {
/* only clear if set. */
- extraOtherInfos[otherinfoNo].oidval = -1;
+ extraOtherInfos[otherinfoNo].oid[0] = -1;
xfree(extraOtherInfos[otherinfoNo].value);
+ extraOtherInfos[otherinfoNo].value = 0;
}
} else {
int i;
- for(i = 0; i < maxOtherInfosSupported; ++i)
+ for(i = 0; i < maxOtherInfosSupported; ++i)
{
- if (extraOtherInfos[i].oidval != -1)
- {
- extraOtherInfos[i].oidval = -1;
+ if (extraOtherInfos[i].value)
+ {
+ extraOtherInfos[i].oid[0] = -1;
xfree(extraOtherInfos[i].value);
+ extraOtherInfos[i].value = 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);
+static int cmd_help(const char *line);
typedef char *(*completerFunctionType)(const char *text, int state);
char *ad;
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|xml <itemno>",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},
{"zversion", cmd_zversion, "", NULL, 0, NULL},
{"help", cmd_help, "", NULL,0,NULL},
{"init", cmd_init, "", NULL,0,NULL},
- {"sru", cmd_sru, "", NULL,0,NULL},
+ {"sru", cmd_sru, "<method> <version>", NULL,0,NULL},
{"exit", cmd_quit, "",NULL,0,NULL},
{0,0,0,0,0,0}
};
-static int cmd_help (const char *line)
+static int cmd_help(const char *line)
{
int i;
char topic[21];
-
+
*topic = 0;
- sscanf (line, "%20s", topic);
+ sscanf(line, "%20s", topic);
if (*topic == 0)
printf("Commands:\n");
for (i = 0; cmd_array[i].cmd; i++)
- if (*topic == 0 || strcmp (topic, cmd_array[i].cmd) == 0)
+ if (*topic == 0 || strcmp(topic, cmd_array[i].cmd) == 0)
printf(" %s %s\n", cmd_array[i].cmd, cmd_array[i].ad);
if (!strcmp(topic, "find"))
{
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;
-
- if (sscanf (arg, "%100s %100s", command, tabargument) < 1) {
+ const char** tabslist;
+
+ if (sscanf(arg, "%100s %100s", command, tabargument) < 1) {
return 0;
}
-
+
/* locate the amdn in the list */
for (i = 0; cmd_array[i].cmd; i++) {
if (!strncmp(cmd_array[i].cmd, command, strlen(command))) {
break;
}
}
-
- 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**));
-
- num_of_tabs=0;
-
+ cmd_array[i].local_tabcompletes = (const char **) calloc(1,sizeof(char**));
+
+ num_of_tabs=0;
+
tabslist = cmd_array[i].local_tabcompletes;
for(; tabslist && *tabslist; tabslist++) {
num_of_tabs++;
}
-
- cmd_array[i].local_tabcompletes = (char **)
+
+ 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;
void process_cmd_line(char* line)
-{
+{
int i, res;
char word[32], arg[10240];
-
+
#if HAVE_GETTIMEOFDAY
- gettimeofday (&tv_start, 0);
+ gettimeofday(&tv_start, 0);
#endif
-
+
if ((res = sscanf(line, "%31s %10239[^;]", word, arg)) <= 0)
{
strcpy(word, last_cmd);
else if (res == 1)
*arg = 0;
strcpy(last_cmd, word);
-
+
/* removed tailing spaces from the arg command */
- {
+ {
char* p = arg;
char* lastnonspace=NULL;
-
+
for(;*p; ++p) {
if(!isspace(*(unsigned char *) p)) {
lastnonspace = p;
}
}
- if(lastnonspace)
+ if(lastnonspace)
*(++lastnonspace) = 0;
}
-
+
for (i = 0; cmd_array[i].cmd; i++)
if (!strncmp(cmd_array[i].cmd, word, strlen(word)))
{
res = (*cmd_array[i].fun)(arg);
break;
}
-
+
if (!cmd_array[i].cmd) /* dump our help-screen */
{
printf("Unknown command: %s.\n", word);
printf("Type 'help' for list of commands\n");
res = 1;
}
-
+
if(apdu_file) fflush(apdu_file);
-
+
if (res >= 2 && auto_wait)
wait_and_handle_response(0);
-
+
if(apdu_file)
fflush(apdu_file);
if(marc_file)
fflush(marc_file);
}
-static 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;
+ static int idx;
if (state==0) {
idx = 0;
}
}
#if HAVE_READLINE_READLINE_H
-static char** default_completer_list = NULL;
+static const char** default_completer_list = NULL;
static char* default_completer(const char* text, int state)
{
#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)
{
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);
+ (CPFunction*)command_generator);
#endif
rl_attempted_completion_over = 1;
return res;
} else {
char arg[10240],word[32];
int i=0 ,res;
- if ((res = sscanf(rl_line_buffer, "%31s %10239[^;]", word, arg)) <= 0) {
+ if ((res = sscanf(rl_line_buffer, "%31s %10239[^;]", word, arg)) <= 0) {
rl_attempted_completion_over = 1;
return NULL;
}
-
+
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;
-
+
default_completer_list = cmd_array[i].local_tabcompletes;
-
+
completerToUse = cmd_array[i].rl_completerfunction;
- if (!completerToUse)
+ if (!completerToUse)
{ /* if command completer is not defined use the default completer */
completerToUse = default_completer;
}
char** res=
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;
}
}
#endif
+#ifndef WIN32
+void ctrl_c_handler(int x)
+{
+ exit_client(0);
+}
+#endif
+
static void client(void)
{
char line[10240];
line[10239] = '\0';
+#ifndef WIN32
+ signal(SIGINT, ctrl_c_handler);
+#endif
+
#if HAVE_GETTIMEOFDAY
- gettimeofday (&tv_start, 0);
+ gettimeofday(&tv_start, 0);
#endif
while (1)
if (*line_in)
add_history(line_in);
#endif
- strncpy(line, line_in, 10239);
+ strncpy(line, line_in, sizeof(line)-1);
free(line_in);
}
-#endif
+#endif
if (!line_in)
{
char *end_p;
- printf (C_PROMPT);
+ printf(C_PROMPT);
fflush(stdout);
- if (!fgets(line, 10239, stdin))
+ if (!fgets(line, sizeof(line)-1, stdin))
break;
- if ((end_p = strchr (line, '\n')))
+ if ((end_p = strchr(line, '\n')))
*end_p = '\0';
}
+ if (isatty(0))
+ file_history_add_line(file_history, line);
process_cmd_line(line);
}
}
static void show_version(void)
{
- char vstr[20];
+ char vstr[20], sha1_str[41];
- yaz_version(vstr, 0);
- printf ("YAZ version: %s\n", YAZ_VERSION);
- if (strcmp(vstr, YAZ_VERSION))
- printf ("YAZ DLL/SO: %s\n", vstr);
+ yaz_version(vstr, sha1_str);
+ printf("YAZ version: %s %s\n", YAZ_VERSION, YAZ_VERSION_SHA1);
+ if (strcmp(sha1_str, YAZ_VERSION_SHA1))
+ printf("YAZ DLL/SO: %s %s\n", vstr, sha1_str);
exit(0);
}
char *open_command = 0;
char *auth_command = 0;
char *arg;
+ const char *rc_file = 0;
int ret;
-
+
#if HAVE_LOCALE_H
if (!setlocale(LC_CTYPE, ""))
- fprintf (stderr, "setlocale failed\n");
+ fprintf(stderr, "setlocale failed\n");
#endif
#if HAVE_LANGINFO_H
#ifdef CODESET
#endif
if (codeset)
outputCharset = xstrdup(codeset);
-
+
ODR_MASK_SET(&z3950_options, Z_Options_search);
ODR_MASK_SET(&z3950_options, Z_Options_present);
ODR_MASK_SET(&z3950_options, Z_Options_namedResultSets);
ODR_MASK_SET(&z3950_options, Z_Options_extendedServices);
ODR_MASK_SET(&z3950_options, Z_Options_delSet);
- while ((ret = options("k:c:q:a:b:m:v:p:u:t:Vxd:", argv, argc, &arg)) != -2)
+ nmem_auth = nmem_create();
+
+ while ((ret = options("k:c:q:a:b:m:v:p:u:t:Vxd:f:", argv, argc, &arg)) != -2)
{
switch (ret)
{
case 0:
if (!open_command)
{
- open_command = (char *) xmalloc (strlen(arg)+6);
- strcpy (open_command, "open ");
- strcat (open_command, arg);
+ open_command = (char *) xmalloc(strlen(arg)+6);
+ strcpy(open_command, "open ");
+ strcat(open_command, arg);
}
else
{
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 'k':
kilobytes = atoi(arg);
break;
case 'm':
- if (!(marc_file = fopen (arg, "a")))
+ if (!(marc_file = fopen(arg, "a")))
{
- perror (arg);
- exit (1);
+ perror(arg);
+ 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);
+ 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 = xstrdup(arg);
+ case 't':
+ outputCharset = xstrdup(arg);
break;
case 'u':
if (!auth_command)
{
- auth_command = (char *) xmalloc (strlen(arg)+6);
- strcpy (auth_command, "auth ");
- strcat (auth_command, arg);
+ auth_command = (char *) xmalloc(strlen(arg)+6);
+ strcpy(auth_command, "auth ");
+ strcat(auth_command, arg);
}
break;
case 'v':
case 'V':
show_version();
break;
+ case 'x':
+ hex_dump = 1;
+ break;
default:
- fprintf (stderr, "Usage: %s "
- " [-a <apdulog>]"
+ fprintf(stderr, "Usage: %s "
+ " [-a apdulog]"
" [-b berdump]"
- " [-d dump]\n"
- " [-c cclfields]"
+ " [-c cclfile]"
+ " [-d dump]"
+ " [-f cmdfile]"
" [-k size]"
- " [-m <marclog>]\n"
- " [-p <proxy-addr>]"
- " [-q cqlfields]"
- " [-u <auth>]"
+ " [-m marclog]"
+ " [-p proxy-addr]"
+ " [-q cqlfile]"
+ " [-t dispcharset]"
+ " [-u auth]"
+ " [-v loglevel]"
" [-V]"
- " [<server-addr>]\n",
+ " [-x]"
+ " [server-addr]\n",
prog);
- exit (1);
- }
+ exit(1);
+ }
}
- initialize();
+ initialize(rc_file);
if (auth_command)
{
#ifdef HAVE_GETTIMEOFDAY
- gettimeofday (&tv_start, 0);
+ gettimeofday(&tv_start, 0);
#endif
- process_cmd_line (auth_command);
+ process_cmd_line(auth_command);
#if HAVE_READLINE_HISTORY_H
add_history(auth_command);
#endif
if (open_command)
{
#ifdef HAVE_GETTIMEOFDAY
- gettimeofday (&tv_start, 0);
+ gettimeofday(&tv_start, 0);
#endif
- process_cmd_line (open_command);
+ process_cmd_line(open_command);
#if HAVE_READLINE_HISTORY_H
add_history(open_command);
#endif
xfree(open_command);
}
- client ();
- exit (0);
+ client();
+ exit_client(0);
+ return 0;
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
projects / yaz-moved-to-github.git / blobdiff