/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
*/
/** \file client.c
* \brief yaz-client program
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <time.h>
-#include <ctype.h>
#ifndef WIN32
#include <signal.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/yaz-ccl.h>
#include <yaz/cql.h>
#include <yaz/log.h>
+#include <yaz/facet.h>
#if HAVE_READLINE_READLINE_H
#include <readline/readline.h>
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 largeSetLowerBound = 1;
static int mediumSetPresentNumber = 0;
static Z_ElementSetNames *elementSetNames = 0;
-static int setno = 1; /* current set offset */
+static Z_FacetList *facet_list = 0;
+static ODR facet_odr = 0;
+static Odr_int setno = 1; /* current set offset */
static enum oid_proto protocol = PROTO_Z3950; /* current app protocol */
#define RECORDSYNTAX_MAX 20
static char *recordsyntax_list[RECORDSYNTAX_MAX];
static char cql_fields[512] = "/usr/local/share/yaz/etc/pqf.properties";
static char *esPackageName = 0;
static char *yazProxy = 0;
-static int kilobytes = 1024;
+static int kilobytes = 64 * 1024;
static char *negotiationCharset = 0;
static int negotiationCharsetRecords = 1;
static int negotiationCharsetVersion = 3;
static char last_cmd[32] = "?";
static FILE *marc_file = 0;
static char *refid = NULL;
-static char *last_open_command = NULL;
static int auto_reconnect = 0;
static int auto_wait = 1;
static Odr_bitmask z3950_options;
static int z3950_version = 3;
static int scan_stepSize = 0;
-static int scan_position = 1;
+static char scan_position[64];
static int scan_size = 20;
static char cur_host[200];
-static int last_hit_count = 0;
+static Odr_int last_hit_count = 0;
+static int pretty_xml = 0;
+static Odr_int sru_maximumRecords = 0;
typedef enum {
QueryType_Prefix,
char* value;
} extraOtherInfos[maxOtherInfosSupported];
-void process_cmd_line(char* line);
+static void process_cmd_line(char* line);
#if HAVE_READLINE_READLINE_H
-char **readline_completer(char *text, int start, int end);
+static char **readline_completer(char *text, int start, int end);
#endif
static char *command_generator(const char *text, int state);
-int cmd_register_tab(const char* arg);
-int cmd_querycharset(const char *arg);
+static int cmd_register_tab(const char* arg);
+static int cmd_querycharset(const char *arg);
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);
+static Z_GDU *get_HTTP_Request_url(ODR odr, const char *url);
+
ODR getODROutputStream(void)
{
return out;
}
-const char* query_type_as_string(QueryType q)
+static 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)";
}
}
-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;
+ size_t i;
+ int x;
for (i = 0; i < len ; i = i+16 )
{
- printf(" %4.4d ",i);
- for(x=0 ; i+x<len && x<16; ++x)
+ printf(" %4.4ld ", (long) i);
+ for (x = 0 ; i+x < len && x < 16; ++x)
{
printf("%2.2X ",(unsigned int)((unsigned char)buf[i+x]));
}
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)
+static void add_otherInfos(Z_APDU *a)
{
Z_OtherInformation **oi;
int i;
yaz_oi_APDU(a, &oi);
- for(i=0; i<maxOtherInfosSupported; ++i)
+ if (facet_list)
+ yaz_oi_set_facetlist(oi, out, facet_list);
+ for (i = 0; i < maxOtherInfosSupported; ++i)
{
if (oid_oidlen(extraOtherInfos[i].oid) > 0)
yaz_oi_set_string_oid(oi, out, extraOtherInfos[i].oid,
buf = odr_getbuf(out, &len, 0);
if (ber_file)
odr_dumpBER(ber_file, buf, len);
- /* printf ("sending APDU of size %d\n", len); */
do_hex_dump(buf, len);
if (cs_put(conn, buf, len) < 0)
{
- fprintf(stderr, "cs_put: %s", cs_errmsg(cs_errno(conn)));
+ fprintf(stderr, "cs_put: %s\n", cs_errmsg(cs_errno(conn)));
close_session();
return 0;
}
return 1;
}
-static void print_stringn(const unsigned char *buf, size_t len)
+static void print_stringn(const char *buf, size_t len)
{
size_t i;
- for (i = 0; i<len; 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]);
else
- printf("\\X%02X", buf[i]);
+ printf("\\X%02X", ((const unsigned char *)buf)[i]);
}
static void print_refid(Z_ReferenceId *id)
if (id)
{
printf("Reference Id: ");
- print_stringn(id->buf, id->len);
+ print_stringn((const char *) id->buf, id->len);
printf("\n");
}
}
/* INIT SERVICE ------------------------------- */
-static void send_initRequest(const char* type_and_host)
+static void send_Z3950_initRequest(const char* type_and_host)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_initRequest);
Z_InitRequest *req = apdu->u.initRequest;
1, type_and_host);
}
- if (negotiationCharset || yazLang) {
+ if (negotiationCharset || yazLang)
+ {
Z_OtherInformation **p;
Z_OtherInformationUnit *p0;
}
-/* These two are used only from process_initResponse() */
static void render_initUserInfo(Z_OtherInformation *ui1);
static void render_diag(Z_DiagnosticFormat *diag);
printf(" %s", opt);
}
-static int process_initResponse(Z_InitResponse *res)
+static int process_Z3950_initResponse(Z_InitResponse *res)
{
int ver = 0;
/* save session parameters for later use */
if (res->userInformationField)
{
Z_External *uif = res->userInformationField;
- if (uif->which == Z_External_userInfo1) {
+ if (uif->which == Z_External_userInfo1)
render_initUserInfo(uif->u.userInfo1);
- } else {
+ else
+ {
printf("UserInformationfield:\n");
if (!z_External(print, (Z_External**)&uif, 0, 0))
{
odr_perror(print, "Printing userinfo\n");
odr_reset(print);
}
- if (uif->which == Z_External_octet) {
+ if (uif->which == Z_External_octet)
+ {
printf("Guessing visiblestring:\n");
printf("'%.*s'\n", uif->u.octet_aligned->len,
uif->u.octet_aligned->buf);
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);
if (ODR_MASK_GET(res->options, Z_Options_namedResultSets))
setnumber = 0;
- if (ODR_MASK_GET(res->options, Z_Options_negotiationModel)) {
-
+ if (ODR_MASK_GET(res->options, Z_Options_negotiationModel))
+ {
Z_CharSetandLanguageNegotiation *p =
yaz_get_charneg_record(res->otherInfo);
}
-static void render_initUserInfo(Z_OtherInformation *ui1) {
+static void render_initUserInfo(Z_OtherInformation *ui1)
+{
int i;
printf("Init response contains %d otherInfo unit%s:\n",
ui1->num_elements, ui1->num_elements == 1 ? "" : "s");
- for (i = 0; i < ui1->num_elements; i++) {
+ for (i = 0; i < ui1->num_elements; i++)
+ {
Z_OtherInformationUnit *unit = ui1->list[i];
printf(" %d: otherInfo unit contains ", i+1);
if (unit->which == Z_OtherInfo_externallyDefinedInfo &&
unit->information.externallyDefinedInfo &&
unit->information.externallyDefinedInfo->which ==
- Z_External_diag1) {
+ Z_External_diag1)
+ {
render_diag(unit->information.externallyDefinedInfo->u.diag1);
}
else if (unit->which != Z_OtherInfo_externallyDefinedInfo)
/* ### should this share code with display_diagrecs()? */
-static void render_diag(Z_DiagnosticFormat *diag) {
+static void render_diag(Z_DiagnosticFormat *diag)
+{
int i;
printf("%d diagnostic%s:\n", diag->num, diag->num == 1 ? "" : "s");
- for (i = 0; i < diag->num; i++) {
+ for (i = 0; i < diag->num; i++)
+ {
Z_DiagnosticFormat_s *ds = diag->elements[i];
printf(" %d: ", i+1);
- switch (ds->which) {
+ switch (ds->which)
+ {
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)
}
else if ((*arg)[0] == '<')
{
- long fsize;
+ size_t fsize;
FILE *inf;
const char *fname;
const char *arg_start = ++(*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)
+static int session_connect_base(const char *arg, const char **basep)
{
void *add;
char type_and_host[101];
- const char *basep = 0;
-#if HAVE_OPENSSL_SSL_H
- SSL *ssl;
-#endif
if (conn)
{
cs_close(conn);
session_mem = NULL;
session_initResponse = 0;
}
- cs_get_host_args(arg, &basep);
+ cs_get_host_args(arg, basep);
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
}
#endif
protocol = conn->protocol;
- if (conn->protocol == PROTO_HTTP)
- set_base("");
- else
- set_base("Default");
printf("Connecting...");
fflush(stdout);
if (cs_connect(conn, add) < 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
- if (basep && *basep)
- set_base (basep);
+ cs_print_session_info(conn);
if (protocol == PROTO_Z3950)
{
- send_initRequest(type_and_host);
+ send_Z3950_initRequest(type_and_host);
return 2;
}
return 0;
}
-int cmd_open(const char *arg)
+static int session_connect(const char *arg)
+{
+ int r;
+ const char *basep = 0;
+
+ r = session_connect_base(arg, &basep);
+ if (basep && *basep)
+ set_base(basep);
+ else if (protocol == PROTO_Z3950)
+ set_base("Default");
+ return r;
+}
+
+static int cmd_open(const char *arg)
{
int r;
if (arg)
strncpy(cur_host, arg, sizeof(cur_host)-1);
cur_host[sizeof(cur_host)-1] = 0;
}
+ set_base("");
r = session_connect(cur_host);
if (conn && conn->protocol == PROTO_HTTP)
queryType = QueryType_CQL;
- return r;
-}
-
-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);
+ return r;
}
-int cmd_authentication(const char *arg)
+static 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 = !strcmp(user, "-") ? 0 : user;
- idPass.password = !strcmp(group, "-") ? 0 : 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;
}
/* SEARCH SERVICE ------------------------------ */
static void display_record(Z_External *r);
-static void print_record(const unsigned char *buf, size_t len)
+static void print_record(const char *buf, size_t len)
{
size_t i = len;
print_stringn(buf, len);
printf("\n");
}
+static void print_xml_record(const char *buf, size_t len)
+{
+ int has_printed = 0;
+#if YAZ_HAVE_XML2
+ if (pretty_xml)
+ {
+ xmlDocPtr doc;
+ xmlKeepBlanksDefault(0); /* get get xmlDocFormatMemory to work! */
+ doc = xmlParseMemory(buf, len);
+ if (doc)
+ {
+ xmlChar *xml_mem;
+ int xml_size;
+ xmlDocDumpFormatMemory(doc, &xml_mem, &xml_size, 1);
+ fwrite(xml_mem, 1, xml_size, stdout);
+ xmlFree(xml_mem);
+ xmlFreeDoc(doc);
+ has_printed = 1;
+ }
+ }
+#endif
+ if (!has_printed)
+ fwrite(buf, 1, len, stdout);
+}
+
static void display_record(Z_External *r)
{
const Odr_oid *oid = r->direct_reference;
}
}
}
- if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_soif))
+ if (oid && r->which == Z_External_octet)
{
- print_record((const unsigned char *) r->u.octet_aligned->buf,
- r->u.octet_aligned->len);
- if (marc_file)
- fwrite(r->u.octet_aligned->buf, 1, r->u.octet_aligned->len, marc_file);
- }
- else if (oid && r->which == Z_External_octet)
- {
- const char *octet_buf = (char*)r->u.octet_aligned->buf;
- 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 (oid && !oid_oidcmp(oid, yaz_oid_recsyn_postscript))
+ const char *octet_buf = (const char*)r->u.octet_aligned->buf;
+ size_t octet_len = r->u.octet_aligned->len;
+ if (!oid_oidcmp(oid, yaz_oid_recsyn_xml)
+ || !oid_oidcmp(oid, yaz_oid_recsyn_xml)
+ || !oid_oidcmp(oid, yaz_oid_recsyn_html))
{
- int size = r->u.octet_aligned->len;
- if (size > 100)
- size = 100;
- print_record((const unsigned char *) octet_buf, size);
+ print_xml_record(octet_buf, octet_len);
+
}
- else
+ else if (yaz_oid_is_iso2709(oid))
{
- if (oid && yaz_oid_is_iso2709(oid))
- {
- const char *result;
- size_t rlen;
- yaz_iconv_t cd = 0;
- yaz_marc_t mt = yaz_marc_create();
- const char *from = 0;
+ const char *result;
+ size_t rlen;
+ yaz_iconv_t cd = 0;
+ yaz_marc_t mt = yaz_marc_create();
+ const char *from = 0;
- if (marcCharset && !strcmp(marcCharset, "auto"))
+ if (marcCharset && !strcmp(marcCharset, "auto"))
+ {
+ if (!oid_oidcmp(oid, yaz_oid_recsyn_usmarc))
{
- if (!oid_oidcmp(oid, yaz_oid_recsyn_usmarc))
- {
- if (octet_buf[9] == 'a')
- from = "UTF-8";
- else
- from = "MARC-8";
- }
+ if (octet_buf[9] == 'a')
+ from = "UTF-8";
else
- from = "ISO-8859-1";
+ from = "MARC-8";
}
- else if (marcCharset)
- from = marcCharset;
- if (outputCharset && from)
+ else
+ from = "ISO-8859-1";
+ }
+ else if (marcCharset)
+ from = marcCharset;
+ if (outputCharset && from)
+ {
+ cd = yaz_iconv_open(outputCharset, from);
+ printf("convert from %s to %s", from,
+ outputCharset);
+ if (!cd)
+ printf(" unsupported\n");
+ else
{
- cd = yaz_iconv_open(outputCharset, from);
- printf("convert from %s to %s", from,
- outputCharset);
- if (!cd)
- printf(" unsupported\n");
- else
- {
- yaz_marc_iconv(mt, cd);
- printf("\n");
- }
+ yaz_marc_iconv(mt, cd);
+ printf("\n");
}
+ }
- if (yaz_marc_decode_buf(mt, octet_buf, r->u.octet_aligned->len,
- &result, &rlen)> 0)
- {
- fwrite(result, rlen, 1, stdout);
- }
- else
+ if (yaz_marc_decode_buf(mt, octet_buf, octet_len,
+ &result, &rlen)> 0)
+ {
+ if (fwrite(result, rlen, 1, stdout) != 1)
{
- printf("bad MARC. Dumping as it is:\n");
- print_record((const unsigned char*) octet_buf,
- r->u.octet_aligned->len);
+ printf("write to stdout failed\n");
}
- yaz_marc_destroy(mt);
- if (cd)
- yaz_iconv_close(cd);
}
else
{
- print_record((const unsigned char*) octet_buf,
- r->u.octet_aligned->len);
+ printf("bad MARC. Dumping as it is:\n");
+ print_record(octet_buf, octet_len);
}
+ yaz_marc_destroy(mt);
+ if (cd)
+ yaz_iconv_close(cd);
+ }
+ else
+ {
+ print_record(octet_buf, octet_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 (oid && !oid_oidcmp(oid, yaz_oid_recsyn_sutrs))
{
printf("Expecting single SUTRS type for SUTRS.\n");
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);
+ print_record((const char *) r->u.sutrs->buf, r->u.sutrs->len);
+ marc_file_write((const char *) r->u.sutrs->buf, r->u.sutrs->len);
}
else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_grs_1))
{
if (oid_oidcmp(r->diagnosticSetId, yaz_oid_diagset_bib_1))
printf("Unknown diagset: %s\n", diag_name);
}
- printf(" [%d] %s", *r->condition, diagbib1_str(*r->condition));
+ printf(" [" ODR_INT_PRINTF "] %s",
+ *r->condition, diagbib1_str(*r->condition));
switch (r->which)
{
case Z_DefaultDiagFormat_v2Addinfo:
}
}
-static int send_deleteResultSetRequest(const char *arg)
+static int send_Z3950_deleteResultSetRequest(const char *arg)
{
char names[8][32];
int i;
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;
}
#if YAZ_HAVE_XML2
-static int send_srw(Z_SRW_PDU *sr)
+static int send_gdu(Z_GDU *gdu)
{
- const char *charset = negotiationCharset;
- const char *host_port = cur_host;
- Z_GDU *gdu;
- char *path = 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 (!yaz_matchstr(sru_method, "get"))
- {
- yaz_sru_get_encode(gdu->u.HTTP_Request, sr, out, charset);
- }
- else if (!yaz_matchstr(sru_method, "post"))
- {
- yaz_sru_post_encode(gdu->u.HTTP_Request, sr, out, charset);
- }
- else if (!yaz_matchstr(sru_method, "soap"))
- {
- yaz_sru_soap_encode(gdu->u.HTTP_Request, sr, out, charset);
- }
-
if (z_GDU(out, &gdu, 0, 0))
{
/* encode OK */
}
return 0;
}
+
+static int send_srw_host_path(Z_SRW_PDU *sr, const char *host_port,
+ char *path)
+{
+ const char *charset = negotiationCharset;
+ Z_GDU *gdu;
+
+ gdu = z_get_HTTP_Request_host_path(out, host_port, path);
+
+ if (auth)
+ {
+ if (auth->which == Z_IdAuthentication_open)
+ {
+ char **darray;
+ int num;
+ nmem_strsplit(out->mem, "/", auth->u.open, &darray, &num);
+ if (num >= 1)
+ sr->username = darray[0];
+ if (num >= 2)
+ sr->password = darray[1];
+ }
+ else if (auth->which == Z_IdAuthentication_idPass)
+ {
+ sr->username = auth->u.idPass->userId;
+ sr->password = auth->u.idPass->password;
+ }
+ }
+
+ if (!yaz_matchstr(sru_method, "get"))
+ {
+ yaz_sru_get_encode(gdu->u.HTTP_Request, sr, out, charset);
+ }
+ else if (!yaz_matchstr(sru_method, "post"))
+ {
+ yaz_sru_post_encode(gdu->u.HTTP_Request, sr, out, charset);
+ }
+ else if (!yaz_matchstr(sru_method, "soap"))
+ {
+ yaz_sru_soap_encode(gdu->u.HTTP_Request, sr, out, charset);
+ }
+ else if (!yaz_matchstr(sru_method, "solr"))
+ {
+ yaz_solr_encode_request(gdu->u.HTTP_Request, sr, out, charset);
+ }
+
+ return send_gdu(gdu);
+}
+
+static int send_srw(Z_SRW_PDU *sr)
+{
+ char *path = yaz_encode_sru_dbpath_odr(out, databaseNames[0]);
+ return send_srw_host_path(sr, cur_host, path);
+}
+
+static int send_SRW_redirect(const char *uri, Z_HTTP_Response *cookie_hres)
+{
+ const char *username = 0;
+ const char *password = 0;
+ struct Z_HTTP_Header *h;
+ char *combined_cookies = 0;
+ int combined_cookies_len = 0;
+ Z_GDU *gdu = get_HTTP_Request_url(out, uri);
+
+ gdu->u.HTTP_Request->method = odr_strdup(out, "GET");
+ z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, "Accept",
+ "text/xml");
+
+ for (h = cookie_hres->headers; h; h = h->next)
+ {
+ if (!strcmp(h->name, "Set-Cookie"))
+ {
+ char *cp;
+
+ if (!(cp = strchr(h->value, ';')))
+ cp = h->value + strlen(h->value);
+ if (cp - h->value >= 1)
+ {
+ combined_cookies = xrealloc(combined_cookies, combined_cookies_len + cp - h->value + 3);
+ memcpy(combined_cookies+combined_cookies_len, h->value, cp - h->value);
+ combined_cookies[combined_cookies_len + cp - h->value] = '\0';
+ strcat(combined_cookies,"; ");
+ combined_cookies_len = strlen(combined_cookies);
+ }
+ }
+ }
+ if (combined_cookies_len)
+ {
+ z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, "Cookie", combined_cookies);
+ xfree(combined_cookies);
+ }
+
+ if (auth)
+ {
+ if (auth->which == Z_IdAuthentication_open)
+ {
+ char **darray;
+ int num;
+ nmem_strsplit(out->mem, "/", auth->u.open, &darray, &num);
+ if (num >= 1)
+ username = darray[0];
+ if (num >= 2)
+ password = darray[1];
+ }
+ else if (auth->which == Z_IdAuthentication_idPass)
+ {
+ username = auth->u.idPass->userId;
+ password = auth->u.idPass->password;
+ }
+ }
+
+ if (username && password)
+ {
+ z_HTTP_header_add_basic_auth(out, &gdu->u.HTTP_Request->headers,
+ username, password);
+ }
+
+ return send_gdu(gdu);
+}
#endif
#if YAZ_HAVE_XML2
}
-static int send_SRW_scanRequest(const char *arg, int pos, int num)
+static int send_SRW_scanRequest(const char *arg, Odr_int *pos, int num)
{
Z_SRW_PDU *sr = 0;
/* regular requestse .. */
sr = yaz_srw_get_pdu(out, Z_SRW_scan_request, sru_version);
- switch(queryType)
+ switch (queryType)
{
case QueryType_CQL:
sr->u.scan_request->query_type = Z_SRW_query_type_cql;
printf("Only CQL and PQF supported in SRW\n");
return 0;
}
- sr->u.scan_request->responsePosition = odr_intdup(out, pos);
+ sr->u.scan_request->responsePosition = pos;
sr->u.scan_request->maximumTerms = odr_intdup(out, num);
return send_srw(sr);
}
/* regular request .. */
sr = yaz_srw_get_pdu(out, Z_SRW_searchRetrieve_request, sru_version);
- switch(queryType)
+ switch (queryType)
{
case QueryType_CQL:
srw_sr->u.request->query_type = Z_SRW_query_type_cql;
printf("Only CQL and PQF supported in SRW\n");
return 0;
}
+ sru_maximumRecords = 0;
sr->u.request->maximumRecords = odr_intdup(out, 0);
-
+ sr->u.request->facetList = facet_list;
if (record_schema)
sr->u.request->recordSchema = record_schema;
if (recordsyntax_size == 1 && !yaz_matchstr(recordsyntax_list[0], "xml"))
}
}
-static int send_searchRequest(const char *arg)
+static int send_Z3950_searchRequest(const char *arg)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_searchRequest);
Z_SearchRequest *req = apdu->u.searchRequest;
printf("CCL ERROR: %s\n", ccl_err_msg(error));
return 0;
}
- } else if (myQueryType == QueryType_CQL2RPN) {
+ }
+ else if (myQueryType == QueryType_CQL2RPN)
+ {
/* ### All this code should be wrapped in a utility function */
CQL_parser parser;
struct cql_node *node;
const char *addinfo;
- if (cqltrans == 0) {
+ if (cqltrans == 0)
+ {
printf("Can't use CQL: no translation file. Try set_cqlfile\n");
return 0;
}
parser = cql_parser_create();
- if ((error = cql_parser_string(parser, arg)) != 0) {
+ if ((error = cql_parser_string(parser, arg)) != 0)
+ {
printf("Can't parse CQL: must be a syntax error\n");
return 0;
}
node = cql_parser_result(parser);
if ((error = cql_transform_buf(cqltrans, node, pqfbuf,
- sizeof pqfbuf)) != 0) {
+ sizeof pqfbuf)) != 0)
+ {
error = cql_transform_error(cqltrans, &addinfo);
printf("Can't convert CQL to PQF: %s (addinfo=%s)\n",
cql_strerror(error), addinfo);
return 2;
}
+static void display_term(Z_Term *term)
+{
+ switch (term->which)
+ {
+ case Z_Term_general:
+ printf("%.*s", term->u.general->len, term->u.general->buf);
+ break;
+ case Z_Term_characterString:
+ printf("%s", term->u.characterString);
+ break;
+ case Z_Term_numeric:
+ printf(ODR_INT_PRINTF, *term->u.numeric);
+ break;
+ case Z_Term_null:
+ printf("null");
+ break;
+ }
+}
+
/* display Query Expression as part of searchResult-1 */
static void display_queryExpression(const char *lead, Z_QueryExpression *qe)
{
if (qe->u.term->queryTerm)
{
Z_Term *term = qe->u.term->queryTerm;
- switch (term->which)
+ display_term(term);
+ }
+ }
+}
+
+static void display_facet(Z_FacetField *facet)
+{
+ if (facet->attributes)
+ {
+ Z_AttributeList *al = facet->attributes;
+ struct yaz_facet_attr attr_values;
+ yaz_facet_attr_init(&attr_values);
+ yaz_facet_attr_get_z_attributes(al, &attr_values);
+ if (!attr_values.errcode)
+ {
+ int term_index;
+ printf(" %s (%d): \n", attr_values.useattr, facet->num_terms);
+ for (term_index = 0 ; term_index < facet->num_terms; term_index++)
{
- case Z_Term_general:
- printf("%.*s", term->u.general->len, term->u.general->buf);
- break;
- case Z_Term_characterString:
- printf("%s", term->u.characterString);
- break;
- case Z_Term_numeric:
- printf("%d", *term->u.numeric);
- break;
- case Z_Term_null:
- printf("null");
- break;
+ Z_FacetTerm *facetTerm = facet->terms[term_index];
+ printf(" ");
+ display_term(facetTerm->term);
+ printf(" (" NMEM_INT_PRINTF ")\n", *facetTerm->count);
}
}
+
+ }
+}
+
+static void* display_facets(Z_FacetList *fl)
+{
+ int index;
+ printf("Facets(%d): \n", fl->num);
+
+ for (index = 0; index < fl->num ; index++)
+ {
+ display_facet(fl->elements[index]);
+ }
+ return 0;
+}
+
+void display_searchResult1(Z_SearchInfoReport *sr)
+{
+ int j;
+ printf("SearchResult-1:");
+ for (j = 0; j < sr->num; j++)
+ {
+ if (j)
+ printf(",");
+ if (!sr->elements[j]->subqueryExpression)
+ printf("%d", j);
+ display_queryExpression("term",
+ sr->elements[j]->subqueryExpression);
+ display_queryExpression("interpretation",
+ sr->elements[j]->subqueryInterpretation);
+ display_queryExpression("recommendation",
+ sr->elements[j]->subqueryRecommendation);
+ if (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");
}
+
+
/* see if we can find USR:SearchResult-1 */
static void display_searchResult(Z_OtherInformation *o)
{
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:");
- for (j = 0; j < sr->num; j++)
- {
- if (j)
- printf(",");
- if (!sr->elements[j]->subqueryExpression)
- printf("%d", j);
- display_queryExpression("term",
- sr->elements[j]->subqueryExpression);
- display_queryExpression("interpretation",
- sr->elements[j]->subqueryInterpretation);
- display_queryExpression("recommendation",
- sr->elements[j]->subqueryRecommendation);
- if (sr->elements[j]->subqueryCount)
- printf(" cnt=%d", *sr->elements[j]->subqueryCount);
- if (sr->elements[j]->subqueryId)
- printf(" id=%s ", sr->elements[j]->subqueryId);
- }
- printf("\n");
- }
+ display_searchResult1(ext->u.searchResult1);
+ else if (ext->which == Z_External_userFacets)
+ display_facets(ext->u.facetList);
}
}
}
-static int process_searchResponse(Z_SearchResponse *res)
+static int process_Z3950_searchResponse(Z_SearchResponse *res)
{
printf("Received SearchResponse.\n");
print_refid(res->referenceId);
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);
if (res->resultSetStatus)
{
printf("Result Set Status: ");
- switch(*res->resultSetStatus)
+ switch (*res->resultSetStatus)
{
case Z_SearchResponse_subset:
printf("subset"); break;
case Z_SearchResponse_estimate:
printf("estimate"); break;
default:
- printf("%d", *res->resultSetStatus);
+ printf(ODR_INT_PRINTF, *res->resultSetStatus);
}
putchar('\n');
}
display_searchResult(res->additionalSearchInfo);
- printf("records returned: %d\n",
+ 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)
{
}
}
-static int process_resourceControlRequest(Z_ResourceControlRequest *req)
+static int process_Z3950_resourceControlRequest(Z_ResourceControlRequest *req)
{
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;
}
-void process_ESResponse(Z_ExtendedServicesResponse *res)
+static void process_Z3950_ESResponse(Z_ExtendedServicesResponse *res)
{
printf("Status: ");
switch (*res->operationStatus)
printf("unknown\n");
}
if ( (*res->operationStatus != Z_ExtendedServicesResponse_failure) &&
- (res->num_diagnostics != 0) ) {
+ (res->num_diagnostics != 0) )
+ {
display_diagrecs(res->diagnostics, res->num_diagnostics);
}
print_refid (res->referenceId);
if (id)
{
printf("Target Reference: ");
- print_stringn (id->buf, id->len);
+ print_stringn((const char *) id->buf, id->len);
printf("\n");
}
if (ext->which == Z_External_update)
}
}
-const char *get_ill_element(void *clientData, const char *element)
+static const char *get_ill_element(void *clientData, const char *element)
{
return 0;
}
}
else
{
+ item_request_buf = odr_getbuf (out, &item_request_size, 0);
r = (Z_External *) odr_malloc(out, sizeof(*r));
r->direct_reference = odr_oiddup(out, yaz_oid_general_isoill_1);
r->indirect_reference = 0;
return r;
}
-static Z_External *create_external_ILL_APDU(int which)
+static Z_External *create_external_ILL_APDU(void)
{
struct ill_get_ctl ctl;
ILL_APDU *ill_apdu;
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");
{
printf("using ILL-request\n");
r->u.itemOrder->u.esRequest->notToKeep->itemRequest =
- create_external_ILL_APDU(ILL_APDU_ILL_Request);
+ create_external_ILL_APDU();
}
else if (!strcmp(type, "xml") || !strcmp(type, "3"))
{
return r;
}
-static int send_itemorder(const char *type, int itemno,
- const char *xml_buf, int xml_len)
+static int send_Z3950_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;
return cmd_update_common(arg, 0);
}
-static int cmd_update_Z3950(int version, int action_no, const char *recid,
+static int send_Z3950_update(int version, int action_no, const char *recid,
char *rec_buf, int rec_len);
-static int cmd_update_SRW(int action_no, const char *recid,
+#if YAZ_HAVE_XML2
+static int send_SRW_update(int action_no, const char *recid,
char *rec_buf, int rec_len);
+#endif
static int cmd_update_common(const char *arg, int version)
{
#if YAZ_HAVE_XML2
if (protocol == PROTO_HTTP)
- return cmd_update_SRW(action_no, recid_buf, rec_buf, rec_len);
+ return send_SRW_update(action_no, recid, rec_buf, rec_len);
#endif
- return cmd_update_Z3950(version, action_no, recid_buf, rec_buf, rec_len);
+ return send_Z3950_update(version, action_no, recid, rec_buf, rec_len);
}
#if YAZ_HAVE_XML2
-static int cmd_update_SRW(int action_no, const char *recid,
- char *rec_buf, int rec_len)
+static int send_SRW_update(int action_no, const char *recid,
+ char *rec_buf, int rec_len)
{
if (!conn)
session_connect(cur_host);
Z_SRW_PDU *srw = yaz_srw_get(out, Z_SRW_update_request);
Z_SRW_updateRequest *sr = srw->u.update_request;
- switch(action_no)
+ switch (action_no)
{
case Z_IUOriginPartToKeep_recordInsert:
sr->operation = "info:srw/action/1/create";
}
#endif
-static int cmd_update_Z3950(int version, int action_no, const char *recid,
+static int send_Z3950_update(int version, int action_no, const char *recid,
char *rec_buf, int rec_len)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest );
}
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));
}
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));
parse_cmd_doc(&arg, out, &xml_buf, &xml_len);
fflush(stdout);
- send_itemorder(type, itemno, xml_buf, xml_len);
+ send_Z3950_itemorder(type, itemno, xml_buf, xml_len);
return 2;
}
}
if (only_z3950())
return 1;
- send_initRequest(cur_host);
+ send_Z3950_initRequest(cur_host);
return 2;
}
-static int cmd_sru(const char *arg)
+static Z_GDU *get_HTTP_Request_url(ODR odr, const char *url)
{
- if (!*arg)
+ Z_GDU *p = z_get_HTTP_Request(odr);
+ const char *host = url;
+ const char *cp0 = strstr(host, "://");
+ const char *cp1 = 0;
+ if (cp0)
+ cp0 = cp0+3;
+ else
+ cp0 = host;
+
+ cp1 = strchr(cp0, '/');
+ if (!cp1)
+ cp1 = cp0 + strlen(cp0);
+
+ if (cp0 && cp1)
{
- printf("SRU method is: %s\n", sru_method);
- printf("SRU version is: %s\n", sru_version);
+ char *h = (char*) odr_malloc(odr, cp1 - cp0 + 1);
+ memcpy (h, cp0, cp1 - cp0);
+ h[cp1-cp0] = '\0';
+ z_HTTP_header_add(odr, &p->u.HTTP_Request->headers, "Host", h);
+ }
+ p->u.HTTP_Request->path = odr_strdup(odr, *cp1 ? cp1 : "/");
+ return p;
+}
+
+static WRBUF get_url(const char *uri, WRBUF username, WRBUF password,
+ int *code, int show_headers)
+{
+ WRBUF result = 0;
+ ODR out = odr_createmem(ODR_ENCODE);
+ ODR in = odr_createmem(ODR_DECODE);
+ Z_GDU *gdu = get_HTTP_Request_url(out, uri);
+
+ gdu->u.HTTP_Request->method = odr_strdup(out, "GET");
+ if (username && password)
+ {
+ z_HTTP_header_add_basic_auth(out, &gdu->u.HTTP_Request->headers,
+ wrbuf_cstr(username),
+ wrbuf_cstr(password));
+ }
+ z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, "Accept",
+ "text/xml");
+ if (!z_GDU(out, &gdu, 0, 0))
+ {
+ yaz_log(YLOG_WARN, "Can not encode HTTP request URL:%s", uri);
}
else
{
- int r;
- r = sscanf(arg, "%9s %9s", sru_method, sru_version);
+ void *add;
+ COMSTACK conn = cs_create_host(uri, 1, &add);
+ if (cs_connect(conn, add) < 0)
+ yaz_log(YLOG_WARN, "Can not connect to URL:%s", uri);
+ else
+ {
+ int len;
+ char *buf = odr_getbuf(out, &len, 0);
+
+ if (cs_put(conn, buf, len) < 0)
+ yaz_log(YLOG_WARN, "cs_put failed URL:%s", uri);
+ else
+ {
+ char *netbuffer = 0;
+ int netlen = 0;
+ int res = cs_get(conn, &netbuffer, &netlen);
+ if (res <= 0)
+ {
+ yaz_log(YLOG_WARN, "cs_get failed URL:%s", uri);
+ }
+ else
+ {
+ Z_GDU *gdu;
+ odr_setbuf(in, netbuffer, res, 0);
+ if (!z_GDU(in, &gdu, 0, 0)
+ || gdu->which != Z_GDU_HTTP_Response)
+ {
+ yaz_log(YLOG_WARN, "decode failed URL: %s", uri);
+ }
+ else
+ {
+ Z_HTTP_Response *res = gdu->u.HTTP_Response;
+ struct Z_HTTP_Header *h;
+ result = wrbuf_alloc();
+ if (show_headers)
+ {
+
+ wrbuf_printf(result, "HTTP %d\n", res->code);
+ for (h = res->headers; h; h = h->next)
+ wrbuf_printf(result, "%s: %s\n",
+ h->name, h->value);
+ }
+ *code = res->code;
+ wrbuf_write(result, res->content_buf, res->content_len);
+ }
+ }
+ xfree(netbuffer);
+ }
+ cs_close(conn);
+ }
+ }
+ odr_destroy(out);
+ odr_destroy(in);
+ return result;
+}
+
+
+static int cmd_url(const char *arg)
+{
+ int code = 0;
+ WRBUF res = get_url(arg, 0, 0, &code, 1);
+ if (res)
+ {
+ if (wrbuf_len(res) > 1200)
+ {
+ fwrite(wrbuf_buf(res), 1, 1200, stdout);
+ printf(".. out of %lld\n", (long long) wrbuf_len(res));
+ }
+ else
+ puts(wrbuf_cstr(res));
+ wrbuf_destroy(res);
+ }
+ return 0;
+}
+
+static int cmd_sru(const char *arg)
+{
+ if (!*arg)
+ {
+ printf("SRU method is: %s\n", sru_method);
+ printf("SRU version is: %s\n", sru_version);
+ }
+ else
+ {
+ int r = sscanf(arg, "%9s %9s", sru_method, sru_version);
if (r >= 1)
{
if (!yaz_matchstr(sru_method, "post"))
;
else if (!yaz_matchstr(sru_method, "soap"))
;
+ else if (!yaz_matchstr(sru_method, "solr"))
+ ;
else
{
strcpy(sru_method, "soap");
printf("Unknown SRU method: %s\n", arg);
- printf("Specify one of POST, GET, SOAP\n");
+ printf("Specify one of POST, GET, SOAP, SOLR\n");
}
}
}
}
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_Z3950_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;
}
- if (!send_searchRequest(arg))
+ else if (conn)
+ {
+ if (!send_Z3950_searchRequest(arg))
+ return 0;
+ }
+ else
+ {
+ printf("Not connected yet\n");
return 0;
+ }
}
return 2;
}
+static int cmd_facets(const char *arg)
+{
+ if (!facet_odr)
+ facet_odr = odr_createmem(ODR_ENCODE);
+ odr_reset(facet_odr);
+
+ if (!*arg)
+ {
+ facet_list = 0;
+ printf("Facets cleared.\n");
+ return 0;
+ }
+ facet_list = yaz_pqf_parse_facet_list(facet_odr, arg);
+ if (!facet_list)
+ {
+ printf("Invalid facet list: %s", arg);
+ return 0;
+ }
+ return 1;
+}
+
static int cmd_delete(const char *arg)
{
if (only_z3950())
return 0;
- if (!send_deleteResultSetRequest(arg))
+ if (!send_Z3950_deleteResultSetRequest(arg))
return 0;
return 2;
}
/* PRESENT SERVICE ----------------------------- */
-static void parse_show_args(const char *arg_c, char *setstring,
- int *start, int *number)
+size_t check_token(const char *haystack, const char *token)
{
- char arg[40];
- char *p;
+ size_t len = strlen(token);
+ size_t extra;
+ if (strncmp(haystack, token, len))
+ return 0;
+ for (extra = 0; haystack[extra + len] != '\0'; extra++)
+ if (!strchr(" \r\n\t", haystack[extra + len]))
+ {
+ if (extra)
+ break;
+ else
+ return 0; /* no whitespace after token */
+ }
+ return extra + len;
+}
+
+static int parse_show_args(const char *arg_c, char *setstring,
+ Odr_int *start, Odr_int *number)
+{
+ char *end_ptr;
+ Odr_int start_position;
+ size_t token_len;
- strncpy(arg, arg_c, sizeof(arg)-1);
- arg[sizeof(arg)-1] = '\0';
+ if (setnumber >= 0)
+ sprintf(setstring, "%d", setnumber);
+ else
+ *setstring = '\0';
- if ((p = strchr(arg, '+')))
+ token_len = check_token(arg_c, "format");
+ if (token_len)
{
- *number = atoi(p + 1);
- *p = '\0';
+ pretty_xml = 1;
+ arg_c += token_len;
}
- if (*arg)
+ else
+ pretty_xml = 0;
+
+ token_len = check_token(arg_c, "all");
+ if (token_len)
{
- if (!strcmp(arg, "all"))
- {
- *number = last_hit_count;
- *start = 1;
- }
- else
- *start = atoi(arg);
+ *number = last_hit_count;
+ *start = 1;
+ return 1;
}
- if (p && (p=strchr(p+1, '+')))
- strcpy(setstring, p+1);
- else if (setnumber >= 0)
- sprintf(setstring, "%d", setnumber);
- else
- *setstring = '\0';
+ start_position = odr_strtol(arg_c, &end_ptr, 10);
+ if (end_ptr == arg_c)
+ return 1;
+ *start = start_position;
+ if (*end_ptr == '\0')
+ return 1;
+ while (yaz_isspace(*end_ptr))
+ end_ptr++;
+ if (*end_ptr != '+')
+ {
+ printf("Bad show arg: expected +. Got %s\n", end_ptr);
+ return 0;
+ }
+ end_ptr++;
+ arg_c = end_ptr;
+ *number = odr_strtol(arg_c, &end_ptr, 10);
+ if (end_ptr == arg_c)
+ {
+ printf("Bad show arg: expected number after +\n");
+ return 0;
+ }
+ if (*end_ptr == '\0')
+ return 1;
+ while (yaz_isspace(*end_ptr))
+ end_ptr++;
+ if (*end_ptr != '+')
+ {
+ printf("Bad show arg: + expected. Got %s\n", end_ptr);
+ return 0;
+ }
+ strcpy(setstring, end_ptr+1);
+ return 1;
}
-static int send_presentRequest(const char *arg)
+static int send_Z3950_presentRequest(const char *arg)
{
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);
- parse_show_args(arg, setstring, &setno, &nos);
+ if (!parse_show_args(arg, setstring, &setno, &nos))
+ return 0;
if (*setstring)
req->resultSetId = setstring;
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)
return 0;
- parse_show_args(arg, setstring, &setno, &nos);
+ if (!parse_show_args(arg, setstring, &setno, &nos))
+ return 0;
sr->u.request->startRecord = odr_intdup(out, setno);
+ sru_maximumRecords = nos;
sr->u.request->maximumRecords = odr_intdup(out, nos);
if (record_schema)
sr->u.request->recordSchema = record_schema;
last_hit_count = 0;
}
-void process_close(Z_Close *req)
+static void process_Z3950_close(Z_Close *req)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_close);
Z_Close *res = apdu->u.close;
printf("Not connected yet\n");
return 0;
}
- if (!send_presentRequest(arg))
+ if (!send_Z3950_presentRequest(arg))
return 0;
}
return 2;
}
-void exit_client(int code)
+static 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)
+static int cmd_quit(const char *arg)
{
printf("See you later, alligator.\n");
xmalloc_trav("");
return 0;
}
-int cmd_cancel(const char *arg)
+static int cmd_cancel(const char *arg)
{
- Z_APDU *apdu = zget_APDU(out, Z_APDU_triggerResourceControlRequest);
- Z_TriggerResourceControlRequest *req =
- apdu->u.triggerResourceControlRequest;
- bool_t rfalse = 0;
- char command[16];
-
- *command = '\0';
- sscanf(arg, "%15s", command);
-
if (only_z3950())
return 0;
- if (session_initResponse &&
- !ODR_MASK_GET(session_initResponse->options,
- Z_Options_triggerResourceCtrl))
+ else
{
- printf("Target doesn't support cancel (trigger resource ctrl)\n");
- return 0;
- }
- *req->requestedAction = Z_TriggerResourceControlRequest_cancel;
- req->resultSetWanted = &rfalse;
- req->referenceId = set_refid(out);
+ Z_APDU *apdu = zget_APDU(out, Z_APDU_triggerResourceControlRequest);
+ Z_TriggerResourceControlRequest *req =
+ apdu->u.triggerResourceControlRequest;
+ bool_t rfalse = 0;
+ char command[16];
- send_apdu(apdu);
- printf("Sent cancel request\n");
- if (!strcmp(command, "wait"))
- return 2;
- return 1;
-}
+ *command = '\0';
+ sscanf(arg, "%15s", command);
+
+ if (only_z3950())
+ return 0;
+ if (session_initResponse &&
+ !ODR_MASK_GET(session_initResponse->options,
+ Z_Options_triggerResourceCtrl))
+ {
+ printf("Target doesn't support cancel (trigger resource ctrl)\n");
+ return 0;
+ }
+ *req->requestedAction = Z_TriggerResourceControlRequest_cancel;
+ req->resultSetWanted = &rfalse;
+ req->referenceId = set_refid(out);
+ send_apdu(apdu);
+ printf("Sent cancel request\n");
+ if (!strcmp(command, "wait"))
+ return 2;
+ return 1;
+ }
+}
-int cmd_cancel_find(const char *arg) {
+static int cmd_cancel_find(const char *arg)
+{
int fres;
- fres=cmd_find(arg);
- if( fres > 0 ) {
+ if (only_z3950())
+ return 0;
+ fres = cmd_find(arg);
+ if (fres > 0)
+ {
return cmd_cancel("");
};
return fres;
}
-int send_scanrequest(const char *set, const char *query,
- int pp, int num, const char *term)
+static int send_Z3950_scanrequest(const char *set, const char *query,
+ Odr_int *pos, 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;
+ printf("query: %s\n", query);
if (queryType == QueryType_CCL2RPN)
{
int error, pos;
{
YAZ_PQF_Parser pqf_parser = yaz_pqf_create();
+
if (!(req->termListAndStartPoint =
yaz_pqf_scan(pqf_parser, out, &req->attributeSet, query)))
{
req->num_databaseNames = num_databaseNames;
req->databaseNames = databaseNames;
req->numberOfTermsRequested = #
- req->preferredPositionInResponse = &pp;
+ req->preferredPositionInResponse = pos;
req->stepSize = odr_intdup(out, scan_stepSize);
if (set)
return 2;
}
-int send_sortrequest(const char *arg, int newset)
+static int send_sortrequest(const char *arg, int newset)
{
Z_APDU *apdu = zget_APDU(out, Z_APDU_sortRequest);
Z_SortRequest *req = apdu->u.sortRequest;
return 2;
}
-void display_term(Z_TermInfo *t)
+static void display_term_info(Z_TermInfo *t)
{
if (t->displayTerm)
printf("%s", t->displayTerm);
t->term->u.general->buf);
if (t->globalOccurrences)
- printf(" (%d)\n", *t->globalOccurrences);
+ printf(" (" ODR_INT_PRINTF ")\n", *t->globalOccurrences);
else
printf("\n");
}
-void process_scanResponse(Z_ScanResponse *res)
+static void process_Z3950_scanResponse(Z_ScanResponse *res)
{
int i;
Z_Entry **entries = NULL;
printf("Received ScanResponse\n");
print_refid(res->referenceId);
- printf("%d entries", *res->numberOfEntriesReturned);
+ printf(ODR_INT_PRINTF " entries", *res->numberOfEntriesReturned);
if (res->positionOfTerm)
- printf(", position=%d", *res->positionOfTerm);
+ 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))
if (entries[i]->which == Z_Entry_termInfo)
{
printf("%c ", i + 1 == pos_term ? '*' : ' ');
- display_term(entries[i]->u.termInfo);
+ display_term_info(entries[i]->u.termInfo);
}
else
display_diagrecs(&entries[i]->u.surrogateDiagnostic, 1);
res->entries->num_nonsurrogateDiagnostics);
}
-void process_sortResponse(Z_SortResponse *res)
+static void process_Z3950_sortResponse(Z_SortResponse *res)
{
printf("Received SortResponse: status=");
switch (*res->sortStatus)
case Z_SortResponse_failure:
printf("failure"); break;
default:
- printf("unknown (%d)", *res->sortStatus);
+ printf("unknown (" ODR_INT_PRINTF ")", *res->sortStatus);
}
printf("\n");
print_refid (res->referenceId);
res->num_diagnostics);
}
-void process_deleteResultSetResponse(Z_DeleteResultSetResponse *res)
+static void process_Z3950_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);
}
}
}
-int cmd_sort_generic(const char *arg, int newset)
+static int cmd_sort_generic(const char *arg, int newset)
{
if (only_z3950())
return 0;
return 0;
}
-int cmd_sort(const char *arg)
+static int cmd_sort(const char *arg)
{
return cmd_sort_generic(arg, 0);
}
-int cmd_sort_newset(const char *arg)
+static int cmd_sort_newset(const char *arg)
{
return cmd_sort_generic(arg, 1);
}
-int cmd_scanstep(const char *arg)
+static int cmd_scanstep(const char *arg)
{
scan_stepSize = atoi(arg);
return 0;
}
-int cmd_scanpos(const char *arg)
+static int cmd_scanpos(const char *arg)
{
- int r = sscanf(arg, "%d", &scan_position);
- if (r == 0)
- scan_position = 1;
+ if (!strcmp(arg, "none"))
+ strcpy(scan_position, "none");
+ else
+ {
+ int dummy;
+ int r = sscanf(arg, "%d", &dummy);
+ if (r == 1 && strlen(arg) < sizeof(scan_position)-1)
+ strcpy(scan_position, arg);
+ else
+ printf("specify number of none for scanpos\n");
+ }
return 0;
}
-int cmd_scansize(const char *arg)
+static int cmd_scansize(const char *arg)
{
int r = sscanf(arg, "%d", &scan_size);
if (r == 0)
static int cmd_scan_common(const char *set, const char *arg)
{
+ Odr_int pos, *pos_p = 0;
+ const char *scan_term = 0;
+ const char *scan_query = 0;
+
+ if (!*arg)
+ {
+ pos = 1;
+ pos_p = &pos;
+ scan_query = last_scan_query;
+ scan_term = last_scan_line;
+ }
+ else
+ {
+ strcpy(last_scan_query, arg);
+ scan_query = arg;
+ if (strcmp(scan_position, "none"))
+ {
+ pos = odr_atoi(scan_position);
+ pos_p = &pos;
+ }
+ }
+
if (protocol == PROTO_HTTP)
{
#if YAZ_HAVE_XML2
session_connect(cur_host);
if (!conn)
return 0;
- if (*arg)
- {
- if (send_SRW_scanRequest(arg, scan_position, scan_size) < 0)
- return 0;
- }
- else
- {
- if (send_SRW_scanRequest(last_scan_line, 1, scan_size) < 0)
- return 0;
- }
+ if (send_SRW_scanRequest(scan_query, pos_p, scan_size) < 0)
+ return 0;
return 2;
#else
return 0;
}
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 (!conn)
+ return 0;
if (session_initResponse &&
!ODR_MASK_GET(session_initResponse->options, Z_Options_scan))
{
printf("Target doesn't support scan\n");
return 0;
}
- if (*arg)
- {
- strcpy(last_scan_query, arg);
- if (send_scanrequest(set, arg,
- scan_position, scan_size, 0) < 0)
- return 0;
- }
- else
- {
- if (send_scanrequest(set, last_scan_query,
- 1, scan_size, last_scan_line) < 0)
- return 0;
- }
+ if (send_Z3950_scanrequest(set, scan_query, pos_p,
+ scan_size, scan_term) < 0)
+ return 0;
return 2;
}
}
-int cmd_scan(const char *arg)
+static int cmd_scan(const char *arg)
{
return cmd_scan_common(0, arg);
}
-int cmd_setscan(const char *arg)
+static int cmd_setscan(const char *arg)
{
char setstring[100];
int nor;
return cmd_scan_common(setstring, arg + nor);
}
-int cmd_schema(const char *arg)
+static int cmd_schema(const char *arg)
{
xfree(record_schema);
record_schema = 0;
return 1;
}
-int cmd_format(const char *arg)
+static int cmd_format(const char *arg)
{
const char *cp = arg;
int nor;
printf("Usage: format <recordsyntax>\n");
return 0;
}
+ while (sscanf(cp, "%40s%n", form_str, &nor) >= 1 && nor > 0
+ && idx < RECORDSYNTAX_MAX)
+ {
+ if (strcmp(form_str, "none") &&
+ !yaz_string_to_oid_odr(yaz_oid_std(), CLASS_RECSYN, form_str, out))
+ {
+ 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)
{
return 1;
}
-int cmd_elements(const char *arg)
+static int cmd_elements(const char *arg)
{
static Z_ElementSetNames esn;
static char what[100];
return 1;
}
-int cmd_querytype(const char *arg)
+static int cmd_querytype(const char *arg)
{
if (!strcmp(arg, "ccl"))
queryType = QueryType_CCL;
return 1;
}
-int cmd_refid(const char *arg)
+static int cmd_refid(const char *arg)
{
xfree(refid);
refid = NULL;
return 1;
}
-int cmd_close(const char *arg)
+static int cmd_close(const char *arg)
{
Z_APDU *apdu;
Z_Close *req;
return 1;
}
-int cmd_proxy(const char* arg)
+static int cmd_proxy(const char* arg)
{
xfree(yazProxy);
yazProxy = 0;
return 1;
}
-int cmd_marccharset(const char *arg)
+static int cmd_marccharset(const char *arg)
{
char l1[30];
return 1;
}
-int cmd_querycharset(const char *arg)
+static int cmd_querycharset(const char *arg)
{
char l1[30];
return 1;
}
-int cmd_displaycharset(const char *arg)
+static int cmd_displaycharset(const char *arg)
{
char l1[30];
return 1;
}
-int cmd_negcharset(const char *arg)
+static int cmd_negcharset(const char *arg)
{
char l1[30];
return 1;
}
-int cmd_charset(const char* arg)
+static int cmd_charset(const char* arg)
{
char l1[30], l2[30], l3[30], l4[30];
return 1;
}
-int cmd_lang(const char* arg)
+static int cmd_lang(const char* arg)
{
- if (*arg == '\0') {
+ if (*arg == '\0')
+ {
printf("Current language is `%s'\n", yazLang ? yazLang : "none");
return 1;
}
return 1;
}
-int cmd_source(const char* arg, int echo )
+static 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);
+ 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;
+ 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);
}
return 1;
}
-int cmd_source_echo(const char* arg)
+static int cmd_source_echo(const char* arg)
{
cmd_source(arg, 1);
return 1;
}
-int cmd_source_noecho(const char* arg)
-{
- cmd_source(arg, 0);
- return 1;
-}
-
-
-int cmd_subshell(const char* args)
+static 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_berfile(const char *arg)
+static int cmd_set_berfile(const char *arg)
{
if (ber_file && ber_file != stdout && ber_file != stderr)
fclose(ber_file);
return 1;
}
-int cmd_set_apdufile(const char *arg)
+static int cmd_set_apdufile(const char *arg)
{
- if(apdu_file && apdu_file != stderr && apdu_file != stderr)
+ if (apdu_file && apdu_file != stderr && apdu_file != stderr)
fclose(apdu_file);
if (!strcmp(arg, ""))
apdu_file = 0;
return 1;
}
-int cmd_set_cclfile(const char* arg)
+static int cmd_set_cclfile(const char* arg)
{
FILE *inf;
return 0;
}
-int cmd_set_cqlfile(const char* arg)
+static int cmd_set_cqlfile(const char* arg)
{
cql_transform_t newcqltrans;
- if ((newcqltrans = cql_transform_open_fname(arg)) == 0) {
+ if ((newcqltrans = cql_transform_open_fname(arg)) == 0)
+ {
perror("unable to open CQL file");
return 0;
}
return 0;
}
-int cmd_set_auto_reconnect(const char* arg)
+static int cmd_set_auto_reconnect(const char* arg)
{
- if(strlen(arg)==0) {
+ if (strlen(arg)==0)
auto_reconnect = ! auto_reconnect;
- } else if(strcmp(arg,"on")==0) {
+ else if (strcmp(arg,"on")==0)
auto_reconnect = 1;
- } else if(strcmp(arg,"off")==0) {
+ else if (strcmp(arg,"off")==0)
auto_reconnect = 0;
- } else {
+ else
+ {
printf("Error use on or off\n");
return 1;
}
return 0;
}
-
-int cmd_set_auto_wait(const char* arg)
+static int cmd_set_auto_wait(const char* arg)
{
- if(strlen(arg)==0) {
+ if (strlen(arg)==0)
auto_wait = ! auto_wait;
- } else if(strcmp(arg,"on")==0) {
+ else if (strcmp(arg,"on")==0)
auto_wait = 1;
- } else if(strcmp(arg,"off")==0) {
+ else if (strcmp(arg,"off")==0)
auto_wait = 0;
- } else {
+ else
+ {
printf("Error use on or off\n");
return 1;
}
return 0;
}
-int cmd_set_marcdump(const char* arg)
+static int cmd_set_marcdump(const char* arg)
{
- if(marc_file && marc_file != stderr) { /* don't close stdout*/
+ if (marc_file && marc_file != stderr)
+ { /* don't close stdout*/
fclose(marc_file);
}
return 1;
}
+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 int cmd_register_oid(const char* args)
+{
static struct {
char* className;
oid_class oclass;
Odr_oid oid[OID_SIZE];
if (sscanf(args, "%100[^ ] %100[^ ] %100s",
- oname_str,oclass_str, oid_str) < 1) {
+ oname_str,oclass_str, oid_str) < 1)
+ {
printf("Error in register command \n");
return 0;
}
- for (i = 0; oid_classes[i].className; i++) {
+ for (i = 0; oid_classes[i].className; i++)
+ {
if (!strcmp(oid_classes[i].className, oclass_str))
{
oidclass=oid_classes[i].oclass;
}
}
- if(!(oid_classes[i].className)) {
+ if (!(oid_classes[i].className))
+ {
printf("Unknown oid class %s\n",oclass_str);
return 0;
}
return 1;
}
-int cmd_push_command(const char* arg)
+static int cmd_push_command(const char* arg)
{
#if HAVE_READLINE_HISTORY_H
- if(strlen(arg)>1)
+ if (strlen(arg) > 1)
add_history(arg);
#else
fprintf(stderr,"Not compiled with the readline/history module\n");
}
}
-void add_to_readline_history(void *client_data, const char *line)
+static void add_to_readline_history(void *client_data, const char *line)
{
#if HAVE_READLINE_HISTORY_H
if (strlen(line))
exit(1);
}
+ strcpy(scan_position, "1");
+
setvbuf(stdout, 0, _IONBF, 0);
if (apdu_file)
odr_setprint(print, apdu_file);
rl_attempted_completion_function =
(char **(*)(const char *, int, int)) readline_completer;
#endif
- for(i = 0; i < maxOtherInfosSupported; ++i) {
+ for (i = 0; i < maxOtherInfosSupported; ++i)
+ {
extraOtherInfos[i].oid[0] = -1;
extraOtherInfos[i].value = 0;
}
cmd_format("usmarc");
+ file_history = file_history_new();
+
source_rc_file(rc_file);
- file_history = file_history_new();
file_history_load(file_history);
file_history_trav(file_history, 0, add_to_readline_history);
}
{
if (rec->recordPosition)
{
- printf("pos=%d", *rec->recordPosition);
+ printf("pos=" ODR_INT_PRINTF, *rec->recordPosition);
setno = *rec->recordPosition + 1;
}
if (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);
+ print_xml_record(rec->recordData_buf, rec->recordData_len);
+ marc_file_write(rec->recordData_buf, rec->recordData_len);
}
else
printf("No data!");
printf("Details: %s\n", res->diagnostics[i].details);
}
if (res->numberOfRecords)
- printf("Number of hits: %d\n", *res->numberOfRecords);
- for (i = 0; i<res->num_records; i++)
+ printf("Number of hits: " ODR_INT_PRINTF "\n", *res->numberOfRecords);
+ if (res->facetList)
+ display_facets(res->facetList);
+ if (res->suggestions)
+ printf("Suggestions:\n%s\n", res->suggestions);
+ for (i = 0; i < res->num_records; i++)
+ {
+ if (i >= sru_maximumRecords)
+ {
+ printf("SRU server returns extra records. Skipping "
+ ODR_INT_PRINTF " records.\n",
+ res->num_records - sru_maximumRecords);
+ break;
+ }
handle_srw_record(res->records + i);
+ }
}
static void handle_srw_scan_term(Z_SRW_scanTerm *term)
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 ret = -1;
const char *connection_head = z_HTTP_header_lookup(hres->headers,
"Connection");
+ if (hres->code != 200)
+ {
+ printf("HTTP Error Status=%d\n", hres->code);
+ }
+
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[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)
+ if (!yaz_matchstr(sru_method, "solr"))
{
- Z_SRW_PDU *sr = (Z_SRW_PDU *) soap_package->u.generic->p;
- if (sr->which == Z_SRW_searchRetrieve_response)
+ Z_SRW_PDU *sr = 0;
+ ODR o = odr_createmem(ODR_DECODE);
+ ret = yaz_solr_decode_response(o, hres, &sr);
+
+ if (ret == 0 && 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
+ {
+ printf("Decoding of SOLR package failed\n");
ret = -1;
- }
- else if (soap_package && (soap_package->which == Z_SOAP_fault
- || soap_package->which == Z_SOAP_error))
- {
- printf("HTTP Error Status=%d\n", hres->code);
- printf("SOAP Fault code %s\n",
- soap_package->u.fault->fault_code);
- printf("SOAP Fault string %s\n",
- soap_package->u.fault->fault_string);
- if (soap_package->u.fault->details)
- printf("SOAP Details %s\n",
- soap_package->u.fault->details);
+ }
+ odr_destroy(o);
}
else
{
- printf("z_soap_codec failed. (no SOAP error)\n");
- ret = -1;
+ Z_SOAP *soap_package = 0;
+ ODR o = odr_createmem(ODR_DECODE);
+ Z_SOAP_Handler soap_handlers[] = {
+ {YAZ_XMLNS_SRU_v2_response, 0, (Z_SOAP_fun) yaz_srw_codec},
+ {YAZ_XMLNS_UPDATE_v0_9, 0, (Z_SOAP_fun) yaz_ucp_codec},
+ {YAZ_XMLNS_SRU_v1_response, 0, (Z_SOAP_fun) yaz_srw_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)
+ {
+ 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
+ {
+ printf("Decoding of SRW package failed\n");
+ ret = -1;
+ }
+ }
+ else if (soap_package && (soap_package->which == Z_SOAP_fault
+ || soap_package->which == Z_SOAP_error))
+ {
+ printf("SOAP Fault code %s\n",
+ soap_package->u.fault->fault_code);
+ printf("SOAP Fault string %s\n",
+ soap_package->u.fault->fault_string);
+ if (soap_package->u.fault->details)
+ printf("SOAP Details %s\n",
+ soap_package->u.fault->details);
+ }
+ else
+ {
+ printf("z_soap_codec failed. (no SOAP error)\n");
+ ret = -1;
+ }
+ odr_destroy(o);
}
- odr_destroy(o);
}
if (ret)
- {
- if (hres->code != 200)
- {
- printf("HTTP Error Status=%d\n", hres->code);
- }
- else
- {
- printf("Decoding of SRW package failed\n");
- }
- close_session();
- }
+ close_session(); /* close session on error */
else
{
if (!strcmp(hres->version, "1.0"))
}
#endif
-void wait_and_handle_response(int one_response_only)
+#define max_HTTP_redirects 2
+
+static void wait_and_handle_response(int one_response_only)
{
int reconnect_ok = 1;
+ int no_redirects = 0;
int res;
char *netbuffer= 0;
int netbufferlen = 0;
if (gdu->which == Z_GDU_Z3950)
{
Z_APDU *apdu = gdu->u.z3950;
- switch(apdu->which)
+ switch (apdu->which)
{
case Z_APDU_initResponse:
- process_initResponse(apdu->u.initResponse);
+ process_Z3950_initResponse(apdu->u.initResponse);
break;
case Z_APDU_searchResponse:
- process_searchResponse(apdu->u.searchResponse);
+ process_Z3950_searchResponse(apdu->u.searchResponse);
break;
case Z_APDU_scanResponse:
- process_scanResponse(apdu->u.scanResponse);
+ process_Z3950_scanResponse(apdu->u.scanResponse);
break;
case Z_APDU_presentResponse:
print_refid(apdu->u.presentResponse->referenceId);
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:
- process_sortResponse(apdu->u.sortResponse);
+ process_Z3950_sortResponse(apdu->u.sortResponse);
break;
case Z_APDU_extendedServicesResponse:
printf("Got extended services response\n");
- process_ESResponse(apdu->u.extendedServicesResponse);
+ process_Z3950_ESResponse(apdu->u.extendedServicesResponse);
break;
case Z_APDU_close:
printf("Target has closed the association.\n");
- process_close(apdu->u.close);
+ process_Z3950_close(apdu->u.close);
break;
case Z_APDU_resourceControlRequest:
- process_resourceControlRequest
- (apdu->u.resourceControlRequest);
+ process_Z3950_resourceControlRequest(
+ apdu->u.resourceControlRequest);
break;
case Z_APDU_deleteResultSetResponse:
- process_deleteResultSetResponse(apdu->u.
- deleteResultSetResponse);
+ process_Z3950_deleteResultSetResponse(
+ apdu->u.deleteResultSetResponse);
break;
default:
printf("Received unknown APDU type (%d).\n",
#if YAZ_HAVE_XML2
else if (gdu->which == Z_GDU_HTTP_Response)
{
- http_response(gdu->u.HTTP_Response);
+ Z_HTTP_Response *hres = gdu->u.HTTP_Response;
+ int code = hres->code;
+ const char *location = 0;
+ if ((code == 301 || code == 302)
+ && no_redirects < max_HTTP_redirects
+ && !yaz_matchstr(sru_method, "get")
+ && (location = z_HTTP_header_lookup(hres->headers, "Location")))
+ {
+ const char *base_tmp;
+ session_connect_base(location, &base_tmp);
+ no_redirects++;
+ if (conn)
+ {
+ if (send_SRW_redirect(location, hres) == 2)
+ continue;
+ }
+ printf("Redirect failed\n");
+ }
+ else
+ http_response(gdu->u.HTTP_Response);
}
#endif
if (one_response_only)
xfree(netbuffer);
}
-
-int cmd_cclparse(const char* arg)
+static int cmd_cclparse(const char* arg)
{
int error, pos;
struct ccl_rpn_node *rpn=NULL;
rpn = ccl_find_str(bibset, arg, &error, &pos);
- if (error) {
+ if (error)
+ {
int ioff = 3+strlen(last_cmd)+1+pos;
printf("%*s^ - ", ioff, " ");
printf("%s\n", ccl_err_msg(error));
return 0;
}
-
-int cmd_set_otherinfo(const char* args)
+static int cmd_set_otherinfo(const char* args)
{
char oidstr[101], otherinfoString[101];
int otherinfoNo;
sscan_res = sscanf(args, "%d %100[^ ] %100s",
&otherinfoNo, oidstr, otherinfoString);
- if (sscan_res > 0 && otherinfoNo >= maxOtherInfosSupported) {
+ if (sscan_res > 0 && otherinfoNo >= maxOtherInfosSupported)
+ {
printf("Error otherinfo index too large (%d>=%d)\n",
otherinfoNo,maxOtherInfosSupported);
return 0;
extraOtherInfos[otherinfoNo].value = 0;
return 0;
}
- if (sscan_res != 3) {
+ if (sscan_res != 3)
+ {
printf("Error in set_otherinfo command \n");
return 0;
}
return 0;
}
-int cmd_sleep(const char* args )
+static int cmd_sleep(const char* args )
{
- int sec=atoi(args);
- if( sec > 0 ) {
+ int sec = atoi(args);
+ if (sec > 0)
+ {
#ifdef WIN32
Sleep(sec*1000);
#else
return 1;
}
-int cmd_list_otherinfo(const char* args)
+static int cmd_list_otherinfo(const char* args)
{
int i;
}
else
{
- for(i = 0; i < maxOtherInfosSupported; ++i)
+ for (i = 0; i < maxOtherInfosSupported; ++i)
{
if (extraOtherInfos[i].value)
{
return 0;
}
-
-int cmd_list_all(const char* args) {
+static 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) {
+ if (!auth)
printf("Authentication : none\n");
- } else {
- switch(auth->which) {
+ else
+ {
+ switch (auth->which)
+ {
case Z_IdAuthentication_idPass:
printf("Authentication : IdPass\n");
printf(" Login User : %s\n",auth->u.idPass->userId?auth->u.idPass->userId:"");
return 0;
}
-int cmd_clear_otherinfo(const char* args)
+static int cmd_clear_otherinfo(const char* args)
{
- if(strlen(args)>0) {
+ if (strlen(args) > 0)
+ {
int otherinfoNo = atoi(args);
- if (otherinfoNo >= maxOtherInfosSupported) {
+ if (otherinfoNo >= maxOtherInfosSupported)
+ {
printf("Error otherinfo index too large (%d>=%d)\n",
otherinfoNo, maxOtherInfosSupported);
return 0;
xfree(extraOtherInfos[otherinfoNo].value);
extraOtherInfos[otherinfoNo].value = 0;
}
- } else {
+ }
+ else
+ {
int i;
- for(i = 0; i < maxOtherInfosSupported; ++i)
+ for (i = 0; i < maxOtherInfosSupported; ++i)
{
if (extraOtherInfos[i].value)
{
return 0;
}
-int cmd_wait_response(const char *arg)
+static int cmd_wait_response(const char *arg)
{
+ int i;
int wait_for = atoi(arg);
- int i=0;
- if( wait_for < 1 ) {
+ if (wait_for < 1)
wait_for = 1;
- };
- for( i=0 ; i < wait_for ; ++i ) {
+ for (i = 0 ; i < wait_for; ++i )
wait_and_handle_response(1);
- };
return 0;
}
{"open", cmd_open, "('tcp'|'ssl')':<host>[':'<port>][/<db>]",NULL,0,NULL},
{"quit", cmd_quit, "",NULL,0,NULL},
{"find", cmd_find, "<query>",NULL,0,NULL},
+ {"facets", cmd_facets, "<query>",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},
{"help", cmd_help, "", NULL,0,NULL},
{"init", cmd_init, "", NULL,0,NULL},
{"sru", cmd_sru, "<method> <version>", NULL,0,NULL},
+ {"url", cmd_url, "<url>", NULL,0,NULL},
{"exit", cmd_quit, "",NULL,0,NULL},
{0,0,0,0,0,0}
};
return 1;
}
-int cmd_register_tab(const char* arg)
+static int cmd_register_tab(const char* arg)
{
#if HAVE_READLINE_READLINE_H
char command[101], tabargument[101];
int num_of_tabs;
const char** tabslist;
- if (sscanf(arg, "%100s %100s", command, tabargument) < 1) {
+ 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))) {
+ 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;
}
num_of_tabs=0;
tabslist = cmd_array[i].local_tabcompletes;
- for(; tabslist && *tabslist; tabslist++) {
+ for (; tabslist && *tabslist; tabslist++)
num_of_tabs++;
- }
cmd_array[i].local_tabcompletes = (const char **)
realloc(cmd_array[i].local_tabcompletes,
return 1;
}
-
-void process_cmd_line(char* line)
+static void process_cmd_line(char* line)
{
int i, res;
char word[32], arg[10240];
char* p = arg;
char* lastnonspace=NULL;
- for(;*p; ++p) {
- if(!isspace(*(unsigned char *) p)) {
+ for (; *p; ++p)
+ {
+ if (!yaz_isspace(*p))
lastnonspace = p;
- }
}
- if(lastnonspace)
+ if (lastnonspace)
*(++lastnonspace) = 0;
}
res = 1;
}
- if(apdu_file) fflush(apdu_file);
+ if (apdu_file)
+ fflush(apdu_file);
if (res >= 2 && auto_wait)
wait_and_handle_response(0);
- if(apdu_file)
+ if (apdu_file)
fflush(apdu_file);
- if(marc_file)
+ if (marc_file)
fflush(marc_file);
}
{
#if HAVE_READLINE_READLINE_H
static int idx;
- if (state==0) {
+ if (state == 0)
idx = 0;
- }
- for( ; cmd_array[idx].cmd; ++idx) {
- if (!strncmp(cmd_array[idx].cmd, text, strlen(text))) {
+ for (; cmd_array[idx].cmd; ++idx)
+ {
+ if (!strncmp(cmd_array[idx].cmd, text, strlen(text)))
+ {
++idx; /* skip this entry on the next run */
return strdup(cmd_array[idx-1].cmd);
}
/*
This function only known how to complete on the first word
*/
-char **readline_completer(char *text, int start, int end)
+static char **readline_completer(char *text, int start, int end)
{
completerFunctionType completerToUse;
- if(start == 0) {
+ if (start == 0)
+ {
#if HAVE_READLINE_RL_COMPLETION_MATCHES
char** res = rl_completion_matches(text, command_generator);
#else
#endif
rl_attempted_completion_over = 1;
return res;
- } else {
+ }
+ else
+ {
char arg[10240],word[32];
- int i=0 ,res;
- if ((res = sscanf(rl_line_buffer, "%31s %10239[^;]", word, arg)) <= 0) {
+ int i ,res;
+ if ((res = sscanf(rl_line_buffer, "%31s %10239[^;]", word, arg)) <= 0)
+ {
rl_attempted_completion_over = 1;
return NULL;
}
if (!strncmp(cmd_array[i].cmd, word, strlen(word)))
break;
- if(!cmd_array[i].cmd)
+ if (!cmd_array[i].cmd)
return NULL;
default_completer_list = cmd_array[i].local_tabcompletes;
{ /* if command completer is not defined use the default completer */
completerToUse = default_completer;
}
- if (completerToUse) {
+ if (completerToUse)
+ {
#ifdef HAVE_READLINE_RL_COMPLETION_MATCHES
char** res=
rl_completion_matches(text, completerToUse);
if (!cmd_array[i].complete_filenames)
rl_attempted_completion_over = 1;
return res;
- } else {
+ }
+ else
+ {
if (!cmd_array[i].complete_filenames)
rl_attempted_completion_over = 1;
return 0;
#endif
#ifndef WIN32
-void ctrl_c_handler(int x)
+static void ctrl_c_handler(int x)
{
exit_client(0);
}
{
line_in=readline(C_PROMPT);
if (!line_in)
+ {
+ putchar('\n');
break;
+ }
#if HAVE_READLINE_HISTORY_H
if (*line_in)
add_history(line_in);
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);
}
ODR_MASK_SET(&z3950_options, Z_Options_extendedServices);
ODR_MASK_SET(&z3950_options, Z_Options_delSet);
+ 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)
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab