/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2013 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 <yaz/comstack.h>
#include <yaz/oid_db.h>
-#define NO_OID 1
#include <yaz/proto.h>
#include <yaz/marcdisp.h>
#include <yaz/diagbib1.h>
static char sru_method[10] = "soap";
static char sru_version[10] = "1.2";
+static char sru_recordPacking[10] = "";
static char *codeset = 0; /* character set for output */
static int hex_dump = 0;
static char *dump_file_prefix = 0;
int num_databaseNames = 0;
static Z_External *record_last = 0;
static int setnumber = -1; /* current result set number */
-static int smallSetUpperBound = 0;
-static int largeSetLowerBound = 1;
-static int mediumSetPresentNumber = 0;
+static Odr_int smallSetUpperBound = 0;
+static Odr_int largeSetLowerBound = 1;
+static Odr_int mediumSetPresentNumber = 0;
static Z_ElementSetNames *elementSetNames = 0;
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 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 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 Odr_int last_hit_count = 0;
+static int pretty_xml = 0;
+static Odr_int sru_maximumRecords = 0;
typedef enum {
QueryType_Prefix,
Z_OtherInformation **oi;
int i;
- yaz_oi_APDU(a, &oi);
- if (facet_list)
+ if (facet_list && a->which == Z_APDU_searchRequest)
+ {
+ oi = &a->u.searchRequest->additionalSearchInfo;
yaz_oi_set_facetlist(oi, out, facet_list);
+ }
+ yaz_oi_APDU(a, &oi);
for (i = 0; i < maxOtherInfosSupported; ++i)
{
if (oid_oidlen(extraOtherInfos[i].oid) > 0)
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;
}
static Z_ReferenceId *set_refid(ODR out)
{
- Z_ReferenceId *id;
if (!refid)
return 0;
- 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);
- return id;
+ return odr_create_Odr_oct(out, refid, strlen(refid));
}
/* 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;
}
-/* 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 */
strncpy(type_and_host, arg, sizeof(type_and_host)-1);
type_and_host[sizeof(type_and_host)-1] = '\0';
- if (yazProxy)
- conn = cs_create_host(yazProxy, 1, &add);
- else
- conn = cs_create_host(arg, 1, &add);
+ conn = cs_create_host_proxy(arg, 1, &add, yazProxy);
if (!conn)
{
printf("Could not resolve address %s\n", arg);
cs_print_session_info(conn);
if (protocol == PROTO_Z3950)
{
- send_initRequest(type_and_host);
+ send_Z3950_initRequest(type_and_host);
return 2;
}
return 0;
strncpy(cur_host, arg, sizeof(cur_host)-1);
cur_host[sizeof(cur_host)-1] = 0;
}
- /* TODO Make facet definition survive the open command without crashing */
- /* TODO Fix deallocation */
- facet_list = 0;
-
set_base("");
r = session_connect(cur_host);
if (conn && conn->protocol == PROTO_HTTP)
printf("\n");
}
+static void print_mab_record(const char *buf, size_t len)
+{
+ size_t i;
+ size_t last_linebreak = 0;
+ size_t last_subfield = 0;
+ for (i = 0; i < len; i++)
+ {
+ // line break after header
+ if ( i == 24 )
+ {
+ printf("\n");
+ last_linebreak = i - 1;
+ }
+
+ // space between field and content
+ if ( i > 24 && i - last_linebreak == 5 )
+ printf(" ");
+
+ // space after subfield
+ if ( last_subfield != 0 && i - last_subfield == 2 )
+ printf(" ");
+
+ if ((buf[i] <= 126 && buf[i] >= 32) || strchr("\n\r\t\f", buf[i]))
+ printf("%c", buf[i]);
+ else if ( buf[i] == 29 ) // record separator
+ printf("\n");
+ else if ( buf[i] == 30 ) // field separator
+ {
+ printf("\n");
+ last_linebreak = i;
+ }
+ else if ( buf[i] == 31 ) // subfield
+ {
+ // space before subfields; except first one
+ if ( i > 24 && i - last_linebreak > 5 )
+ printf(" ");
+ printf("$");
+ last_subfield = i;
+ }
+ else
+ printf("\\X%02X", ((const unsigned char *)buf)[i]);
+ }
+}
+
+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;
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_application_xml)
|| !oid_oidcmp(oid, yaz_oid_recsyn_html))
{
- fwrite(octet_buf, 1, octet_len, stdout);
+ print_xml_record(octet_buf, octet_len);
}
- else if (yaz_oid_is_iso2709(oid))
+ else if (!oid_oidcmp(oid, yaz_oid_recsyn_mab))
+ {
+ print_mab_record(octet_buf, octet_len);
+ }
+ else
{
const char *result;
size_t rlen;
}
else
{
- printf("bad MARC. Dumping as it is:\n");
+ if (yaz_oid_is_iso2709(oid))
+ 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);
- }
marc_file_write(octet_buf, r->u.octet_aligned->len);
}
else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_sutrs))
}
}
-static int send_deleteResultSetRequest(const char *arg)
+static int send_Z3950_deleteResultSetRequest(const char *arg)
{
char names[8][32];
int i;
{
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_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;
- sr->u.scan_request->scanClause.cql = encode_SRW_term(out, arg);
+ sr->u.scan_request->queryType = "cql";
+ sr->u.scan_request->scanClause = encode_SRW_term(out, arg);
break;
case QueryType_Prefix:
- sr->u.scan_request->query_type = Z_SRW_query_type_pqf;
- sr->u.scan_request->scanClause.pqf = encode_SRW_term(out, arg);
+ sr->u.scan_request->queryType = "pqf";
+ sr->u.scan_request->scanClause = encode_SRW_term(out, arg);
break;
default:
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;
- srw_sr->u.request->query.cql = encode_SRW_term(srw_sr_odr_out, arg);
+ srw_sr->u.request->queryType = "cql";
+ srw_sr->u.request->query = encode_SRW_term(srw_sr_odr_out, arg);
- sr->u.request->query_type = Z_SRW_query_type_cql;
- sr->u.request->query.cql = encode_SRW_term(srw_sr_odr_out, arg);
+ sr->u.request->queryType = "cql";
+ sr->u.request->query = encode_SRW_term(srw_sr_odr_out, arg);
break;
case QueryType_Prefix:
- srw_sr->u.request->query_type = Z_SRW_query_type_pqf;
- srw_sr->u.request->query.pqf = encode_SRW_term(srw_sr_odr_out, arg);
+ srw_sr->u.request->queryType = "pqf";
+ srw_sr->u.request->query = encode_SRW_term(srw_sr_odr_out, arg);
- sr->u.request->query_type = Z_SRW_query_type_pqf;
- sr->u.request->query.pqf = encode_SRW_term(srw_sr_odr_out, arg);
+ sr->u.request->queryType = "pqf";
+ sr->u.request->query = encode_SRW_term(srw_sr_odr_out, arg);
break;
default:
printf("Only CQL and PQF supported in SRW\n");
return 0;
}
+ if (*sru_recordPacking)
+ sr->u.request->recordPacking = sru_recordPacking;
+ sru_maximumRecords = 0;
sr->u.request->maximumRecords = odr_intdup(out, 0);
-
- if (record_schema)
- sr->u.request->recordSchema = record_schema;
+ sr->u.request->facetList = facet_list;
+ sr->u.request->recordSchema = record_schema;
if (recordsyntax_size == 1 && !yaz_matchstr(recordsyntax_list[0], "xml"))
sr->u.request->recordPacking = "xml";
return send_srw(sr);
}
}
-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)
{
/* ### All this code should be wrapped in a utility function */
req->referenceId = set_refid(out);
if (!strcmp(arg, "@big")) /* strictly for troublemaking */
{
- static unsigned char big[2100];
+ static char big[2100];
static Odr_oct bigo;
/* send a very big referenceid to test transport stack etc. */
memset(big, 'A', 2100);
- bigo.len = bigo.size = 2100;
+ bigo.len = 2100;
bigo.buf = big;
req->referenceId = &bigo;
}
case QueryType_CCL:
query.which = Z_Query_type_2;
query.u.type_2 = &ccl_query;
- ccl_query.buf = (unsigned char*) arg;
+ ccl_query.buf = (char *) arg;
ccl_query.len = strlen(arg);
break;
case QueryType_CCL2RPN:
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(" " ODR_INT_PRINTF, *term->u.numeric);
+ printf(ODR_INT_PRINTF, *term->u.numeric);
break;
case Z_Term_null:
- printf(" null");
+ printf("null");
break;
}
}
{
Z_AttributeList *al = facet->attributes;
struct yaz_facet_attr attr_values;
- attr_values.errcode = 0;
- attr_values.limit = -1;
- attr_values.useattr = 0;
- attr_values.relation = "default";
-
+ 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, /* attr_values.relation, attr_values.limit, */ facet->num_terms);
+ printf(" %s (%d): \n", attr_values.useattr, facet->num_terms);
for (term_index = 0 ; term_index < facet->num_terms; term_index++)
{
Z_FacetTerm *facetTerm = facet->terms[term_index];
+ printf(" ");
display_term(facetTerm->term);
printf(" (" NMEM_INT_PRINTF ")\n", *facetTerm->count);
}
}
}
-static int process_searchResponse(Z_SearchResponse *res)
+static int process_Z3950_searchResponse(Z_SearchResponse *res)
{
printf("Received SearchResponse.\n");
print_refid(res->referenceId);
if (res->resultSetStatus)
{
printf("Result Set Status: ");
- switch(*res->resultSetStatus)
+ switch (*res->resultSetStatus)
{
case Z_SearchResponse_subset:
printf("subset"); break;
int i;
print_level(iLevel);
- printf("Ref Id (%d, %d): ", referenceId->len, referenceId->size);
+ printf("Ref Id (%d): ", referenceId->len);
for (i = 0; i < referenceId->len; i++)
printf("%c", referenceId->buf[i]);
printf("\n");
}
}
-static int process_resourceControlRequest(Z_ResourceControlRequest *req)
+static int process_Z3950_resourceControlRequest(Z_ResourceControlRequest *req)
{
printf("Received ResourceControlRequest.\n");
print_referenceId(1, req->referenceId);
return 0;
}
-static void process_ESResponse(Z_ExtendedServicesResponse *res)
+static void process_Z3950_ESResponse(Z_ExtendedServicesResponse *res)
{
printf("Status: ");
switch (*res->operationStatus)
}
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;
r->descriptor = 0;
r->which = Z_External_single;
-
- r->u.single_ASN1_type = (Odr_oct *)
- odr_malloc(out, sizeof(*r->u.single_ASN1_type));
- r->u.single_ASN1_type->buf = (unsigned char *)
- 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,
- item_request_size);
-
+ r->u.single_ASN1_type =
+ odr_create_Odr_oct(out, item_request_buf, item_request_size);
do_hex_dump(item_request_buf,item_request_size);
}
return r;
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));
- r->u.single_ASN1_type->buf = (unsigned char *)
- 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); */
-/* do_hex_dump(ill_request_buf,ill_request_size); */
-/* printf("--- end of extenal\n"); */
-
+ r->u.single_ASN1_type = odr_create_Odr_oct(out, ill_request_buf,
+ ill_request_size);
}
return r;
}
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);
#if YAZ_HAVE_XML2
-static int cmd_update_SRW(int action_no, const char *recid,
+static int send_SRW_update(int action_no, const char *recid,
char *rec_buf, int rec_len);
#endif
#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 );
notToKeep->elements[0] = (Z_IU0SuppliedRecords_elem *)
odr_malloc(out, sizeof(**notToKeep->elements));
notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque;
- if (recid)
- {
- notToKeep->elements[0]->u.opaque = (Odr_oct *)
- odr_malloc(out, sizeof(Odr_oct));
- notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid;
- notToKeep->elements[0]->u.opaque->size = strlen(recid);
- notToKeep->elements[0]->u.opaque->len = strlen(recid);
- }
- else
- notToKeep->elements[0]->u.opaque = 0;
+ notToKeep->elements[0]->u.opaque = recid ?
+ odr_create_Odr_oct(out, recid, strlen(recid)) : 0;
notToKeep->elements[0]->supplementalId = 0;
notToKeep->elements[0]->correlationInfo = 0;
notToKeep->elements[0]->record = record_this;
notToKeep->elements[0] = (Z_IUSuppliedRecords_elem *)
odr_malloc(out, sizeof(**notToKeep->elements));
notToKeep->elements[0]->which = Z_IUSuppliedRecords_elem_opaque;
- if (recid)
- {
- notToKeep->elements[0]->u.opaque = (Odr_oct *)
- odr_malloc(out, sizeof(Odr_oct));
- notToKeep->elements[0]->u.opaque->buf = (unsigned char *) recid;
- notToKeep->elements[0]->u.opaque->size = strlen(recid);
- notToKeep->elements[0]->u.opaque->len = strlen(recid);
- }
- else
- notToKeep->elements[0]->u.opaque = 0;
+ notToKeep->elements[0]->u.opaque = recid ?
+ odr_create_Odr_oct(out, recid, strlen(recid)) : 0;
notToKeep->elements[0]->supplementalId = 0;
notToKeep->elements[0]->correlationInfo = 0;
notToKeep->elements[0]->record = record_this;
&ext->u.single_ASN1_type->len) == 0)
return 0;
- ext->u.single_ASN1_type->buf = (unsigned char *) asn_buf;
+ ext->u.single_ASN1_type->buf = asn_buf;
oid = yaz_string_to_oid_odr(yaz_oid_std(),
CLASS_EXTSERV, oid_str, out);
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;
}
setno = 1;
/* save this for later .. when fetching individual records */
- sr = yaz_srw_get(out, Z_SRW_explain_request);
+ sr = yaz_srw_get_pdu(out, Z_SRW_explain_request, sru_version);
if (recordsyntax_size == 1
&& !yaz_matchstr(recordsyntax_list[0], "xml"))
sr->u.explain_request->recordPacking = "xml";
}
if (only_z3950())
return 1;
- send_initRequest(cur_host);
+ send_Z3950_initRequest(cur_host);
return 2;
}
}
else
{
- int r;
- r = sscanf(arg, "%9s %9s", sru_method, sru_version);
+ int r = sscanf(arg, "%9s %9s %9s", sru_method, sru_version,
+ sru_recordPacking);
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");
}
}
}
{
if (conn)
{
- if (!send_searchRequest(arg))
+ if (!send_Z3950_searchRequest(arg))
return 0;
wait_and_handle_response(0);
if (conn)
}
else if (conn)
{
- if (!send_searchRequest(arg))
+ if (!send_Z3950_searchRequest(arg))
return 0;
}
else
static int cmd_facets(const char *arg)
{
- int size = 0;
+ if (!facet_odr)
+ facet_odr = odr_createmem(ODR_ENCODE);
+ odr_reset(facet_odr);
+
if (!*arg)
{
facet_list = 0;
printf("Facets cleared.\n");
return 0;
}
- size = strlen(arg);
- if (only_z3950())
+ facet_list = yaz_pqf_parse_facet_list(facet_odr, arg);
+ if (!facet_list)
{
- printf("Currently only supported for Z39.50.\n");
+ printf("Invalid facet list: %s", arg);
return 0;
}
- else
- {
- /* TODO Wrong odr. Loosing memory */
- ODR odr = odr_createmem(ODR_ENCODE);
- facet_list = yaz_pqf_parse_facet_list(odr, arg);
-
- if (!facet_list)
- {
- printf("Invalid facet list: %s", arg);
- return 0;
- }
- return 1;
- }
- return 2;
+ 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;
}
static int cmd_ssub(const char *arg)
{
- if (!(smallSetUpperBound = atoi(arg)))
- return 0;
+ smallSetUpperBound = odr_strtol(arg, 0, 10);
return 1;
}
static int cmd_lslb(const char *arg)
{
- if (!(largeSetLowerBound = atoi(arg)))
- return 0;
+ largeSetLowerBound = odr_strtol(arg, 0, 10);
return 1;
}
static int cmd_mspn(const char *arg)
{
- if (!(mediumSetPresentNumber = atoi(arg)))
- return 0;
+ mediumSetPresentNumber = odr_strtol(arg, 0, 10);
return 1;
}
static int cmd_status(const char *arg)
{
- printf("smallSetUpperBound: %d\n", smallSetUpperBound);
- printf("largeSetLowerBound: %d\n", largeSetLowerBound);
- printf("mediumSetPresentNumber: %d\n", mediumSetPresentNumber);
+ printf("smallSetUpperBound: " ODR_INT_PRINTF "\n",
+ smallSetUpperBound);
+ printf("largeSetLowerBound: " ODR_INT_PRINTF "\n",
+ largeSetLowerBound);
+ printf("mediumSetPresentNumber: " ODR_INT_PRINTF "\n",
+ mediumSetPresentNumber);
return 1;
}
/* PRESENT SERVICE ----------------------------- */
+size_t check_token(const char *haystack, const char *token)
+{
+ 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;
if (setnumber >= 0)
sprintf(setstring, "%d", setnumber);
else
*setstring = '\0';
- if (!strcmp(arg_c, "all"))
+ token_len = check_token(arg_c, "format");
+ if (token_len)
+ {
+ pretty_xml = 1;
+ arg_c += token_len;
+ }
+ else
+ pretty_xml = 0;
+
+ token_len = check_token(arg_c, "all");
+ if (token_len)
{
*number = last_hit_count;
*start = 1;
+ return 1;
}
start_position = odr_strtol(arg_c, &end_ptr, 10);
if (end_ptr == arg_c)
*start = start_position;
if (*end_ptr == '\0')
return 1;
- while (isspace(*(unsigned char *)end_ptr))
+ while (yaz_isspace(*end_ptr))
end_ptr++;
if (*end_ptr != '+')
{
}
if (*end_ptr == '\0')
return 1;
- while (isspace(*(unsigned char *)end_ptr))
+ while (yaz_isspace(*end_ptr))
end_ptr++;
if (*end_ptr != '+')
{
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;
return 0;
if (!parse_show_args(arg, setstring, &setno, &nos))
return 0;
+ if (*sru_recordPacking)
+ sr->u.request->recordPacking = sru_recordPacking;
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;
+ sr->u.request->recordSchema = record_schema;
if (recordsyntax_size == 1 && !yaz_matchstr(recordsyntax_list[0], "xml"))
sr->u.request->recordPacking = "xml";
return send_srw(sr);
last_hit_count = 0;
}
-static 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;
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;
+ }
}
static int cmd_cancel_find(const char *arg)
{
- int fres = cmd_find(arg);
+ int fres;
+ if (only_z3950())
+ return 0;
+ fres = cmd_find(arg);
if (fres > 0)
{
return cmd_cancel("");
return fres;
}
-static int send_scanrequest(const char *set, const char *query,
- Odr_int pp, Odr_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;
req->termListAndStartPoint->term->u.general)
{
req->termListAndStartPoint->term->u.general->buf =
- (unsigned char *) odr_strdup(out, term);
- req->termListAndStartPoint->term->u.general->len =
- req->termListAndStartPoint->term->u.general->size =
- strlen(term);
+ odr_strdup(out, term);
+ req->termListAndStartPoint->term->u.general->len = strlen(term);
}
}
req->referenceId = set_refid(out);
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)
printf("\n");
}
-static void process_scanResponse(Z_ScanResponse *res)
+static void process_Z3950_scanResponse(Z_ScanResponse *res)
{
int i;
Z_Entry **entries = NULL;
res->entries->num_nonsurrogateDiagnostics);
}
-static void process_sortResponse(Z_SortResponse *res)
+static void process_Z3950_sortResponse(Z_SortResponse *res)
{
printf("Received SortResponse: status=");
switch (*res->sortStatus)
res->num_diagnostics);
}
-static void process_deleteResultSetResponse(Z_DeleteResultSetResponse *res)
+static void process_Z3950_deleteResultSetResponse(
+ Z_DeleteResultSetResponse *res)
{
printf("Got deleteResultSetResponse status=" ODR_INT_PRINTF "\n",
*res->deleteOperationStatus);
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;
}
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;
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;
}
}
printf("Error use on or off\n");
return 1;
}
-
+
if (auto_reconnect)
printf("Set auto reconnect enabled.\n");
else
exit(1);
}
+ strcpy(scan_position, "1");
+
setvbuf(stdout, 0, _IONBF, 0);
if (apdu_file)
odr_setprint(print, apdu_file);
printf("\n");
if (rec->recordData_buf && rec->recordData_len)
{
- printf("%.*s", rec->recordData_len, rec->recordData_buf);
+ print_xml_record(rec->recordData_buf, rec->recordData_len);
marc_file_write(rec->recordData_buf, rec->recordData_len);
}
else
}
if (res->numberOfRecords)
printf("Number of hits: " ODR_INT_PRINTF "\n", *res->numberOfRecords);
- for (i = 0; i<res->num_records; i++)
+ 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)
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);
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)
+ else if (ret == 0 && 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");
+ 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("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_mask, 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)
close_session(); /* close session on error */
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);
*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",
printf("Named Result Sets : %s\n",setnumber==-1?"off":"on");
/* piggy back options */
- printf("ssub/lslb/mspn : %d/%d/%d\n",smallSetUpperBound,largeSetLowerBound,mediumSetPresentNumber);
+ printf("ssub/lslb/mspn : " ODR_INT_PRINTF "/" ODR_INT_PRINTF "/"
+ ODR_INT_PRINTF "\n",
+ smallSetUpperBound, largeSetLowerBound, mediumSetPresentNumber);
/* print present related options */
if (recordsyntax_size > 0)
{
int i;
int wait_for = atoi(arg);
- if (wait_for < 1)
+ if (wait_for < 1)
wait_for = 1;
for (i = 0 ; i < wait_for; ++i )
for (; *p; ++p)
{
- if (!isspace(*(unsigned char *) p))
+ if (!yaz_isspace(*p))
lastnonspace = p;
}
if (lastnonspace)