/* 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>
#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 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,
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);
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)";
for (i = 0; i < len ; i = i+16 )
{
printf(" %4.4ld ", (long) i);
- for(x=0 ; i+x<len && x<16; ++x)
+ for (x = 0 ; i+x < len && x < 16; ++x)
{
printf("%2.2X ",(unsigned int)((unsigned char)buf[i+x]));
}
}
}
-void add_otherInfos(Z_APDU *a)
+static void add_otherInfos(Z_APDU *a)
{
Z_OtherInformation **oi;
- int i = 0;
+ int i;
yaz_oi_APDU(a, &oi);
- if (facet_list) {
- yaz_oi_set_facetlist_oid(oi, out, yaz_oid_userinfo_facet_1, 1, facet_list);
- i++;
- }
- for(; 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;
}
/* 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);
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' */
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(yazProxy, 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;
return r;
}
-int cmd_open(const char *arg)
+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;
}
- /* 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)
return r;
}
-int cmd_authentication(const char *arg)
+static int cmd_authentication(const char *arg)
{
char **args;
int r;
auth->which = Z_IdAuthentication_anonymous;
auth->u.anonymous = odr_nullval();
printf("Authentication set to Anonymous\n");
- }
+ }
else
{
auth->which = Z_IdAuthentication_open;
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;
|| !oid_oidcmp(oid, yaz_oid_recsyn_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))
{
yaz_iconv_t cd = 0;
yaz_marc_t mt = yaz_marc_create();
const char *from = 0;
-
+
if (marcCharset && !strcmp(marcCharset, "auto"))
{
if (!oid_oidcmp(oid, yaz_oid_recsyn_usmarc))
printf("\n");
}
}
-
+
if (yaz_marc_decode_buf(mt, octet_buf, octet_len,
&result, &rlen)> 0)
{
}
}
-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);
}
const char *username = 0;
const char *password = 0;
struct Z_HTTP_Header *h;
- char *combined_cookies;
+ 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")) {
+ if (!strcmp(h->name, "Set-Cookie"))
+ {
char *cp;
if (!(cp = strchr(h->value, ';')))
cp = h->value + strlen(h->value);
- if (cp - h->value >= 1) {
+ 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';
}
-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(ODR_INT_PRINTF, *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, attribute_index;
- printf("UserFacets-1:");
- for (index = 0; index < fl->num ; index++) {
- if (index)
- printf(",");
- if (!fl->elements[index]->attributes) {
- Z_AttributeList *al = fl->elements[index]->attributes;
- for (attribute_index = 0; attribute_index < al->num_attributes; attribute_index++) {
- switch (al->attributes[attribute_index]->which) {
- case Z_AttributeValue_complex:
- break;
- case Z_AttributeValue_numeric:
- break;
- default:
- break;
- };
- }
- }
+ int index;
+ printf("Facets(%d): \n", fl->num);
+ for (index = 0; index < fl->num ; index++)
+ {
+ display_facet(fl->elements[index]);
}
return 0;
}
}
}
-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;
}
}
-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;
}
-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);
}
}
-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 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 );
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;
}
cp0 = cp0+3;
else
cp0 = host;
-
+
cp1 = strchr(cp0, '/');
if (!cp1)
cp1 = cp0 + strlen(cp0);
-
+
if (cp0 && cp1)
{
char *h = (char*) odr_malloc(odr, cp1 - cp0 + 1);
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)
{
"text/xml");
if (!z_GDU(out, &gdu, 0, 0))
{
- yaz_log(YLOG_WARN, "Can not encode HTTP request URL:%s", uri);
+ yaz_log(YLOG_WARN, "Can not encode HTTP request 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
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",
odr_destroy(in);
return result;
}
-
+
static int cmd_url(const char *arg)
{
}
else
{
- int r;
- r = sscanf(arg, "%9s %9s", sru_method, sru_version);
+ 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");
}
}
}
{
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
return 2;
}
-static Z_FacetField* parse_facet(ODR odr, const char *facet, int length)
-{
- YAZ_PQF_Parser pqf_parser = yaz_pqf_create();
- char buffer[length+1];
- Odr_oid *attributeSetId;
- Z_FacetField *facet_field;
- Z_AttributeList *attribute_list;
- memcpy(buffer, facet, length);
- buffer[length] = '\0';
- attribute_list = yaz_pqf_scan_attribute_list(pqf_parser, odr, &attributeSetId, buffer);
-
- if (!attribute_list) {
- printf("Invalid facet definition: %s", facet);
- return 0;
- }
- facet_field = odr_malloc(odr, sizeof(*facet_field));
- facet_field->attributes = attribute_list;
- facet_field->num_terms = 0;
- facet_field->terms = 0;
- return facet_field;
-}
-
-#define FACET_DElIMITER ','
-
-static int scan_facet_argument(const char *arg) {
- int index;
- int length = strlen(arg);
- int count = 1;
- for (index = 0; index < length; index++) {
- if (arg[index] == FACET_DElIMITER)
- count++;
- }
- return count;
-}
-
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
- {
- int index = 0;
- Z_FacetField **elements;
- int num_elements ;
- const char *facet = arg;
- // parse facets list
- ODR odr = odr_createmem(ODR_ENCODE);
- num_elements = scan_facet_argument(arg);
- facet_list = odr_malloc(odr, sizeof(*facet_list));
- elements = odr_malloc(odr, num_elements * sizeof(*elements));
- for (index = 0; index < num_elements;) {
- const char *pos = strchr(facet, FACET_DElIMITER);
- if (pos == 0)
- pos = facet + strlen(facet);
- elements[index] = parse_facet(odr, (const char *) facet, (pos - facet));
- if (elements[index]) {
- index++;
- }
- else
- num_elements--;
- facet = pos + 1;
- }
-
- if (!num_elements || !facet_list) {
- printf("Invalid facet list: %s", arg);
- return 0;
- }
- facet_list->elements = elements;
- facet_list->num = index;
- 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;
}
/* 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;
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);
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);
-int cmd_cancel_find(const char *arg) {
+ 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;
- 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,
- 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->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);
printf("\n");
}
-void process_scanResponse(Z_ScanResponse *res)
+static void process_Z3950_scanResponse(Z_ScanResponse *res)
{
int i;
Z_Entry **entries = NULL;
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)
res->num_diagnostics);
}
-void process_deleteResultSetResponse(Z_DeleteResultSetResponse *res)
+static void process_Z3950_deleteResultSetResponse(
+ Z_DeleteResultSetResponse *res)
{
printf("Got deleteResultSetResponse status=" ODR_INT_PRINTF "\n",
*res->deleteOperationStatus);
}
}
-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;
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;
while (sscanf(cp, "%40s%n", form_str, &nor) >= 1 && nor > 0
&& idx < RECORDSYNTAX_MAX)
{
- if (strcmp(form_str, "none") &&
+ 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);
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;
return -1;
}
- while (fgets(line, sizeof(line), includeFile))
+ while (fgets(line, sizeof(line), includeFile))
{
if (strlen(line) < 2)
continue;
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)
{
int ret = system(strlen(args) ? args : getenv("SHELL"));
printf("\n");
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);
}
/*
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;
}
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_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)
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",
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 */
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;
}
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);
}
projects / yaz-moved-to-github.git / blobdiff