/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
*/
/** \file client.c
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;
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 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 ------------------------------- */
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);
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))
{
print_xml_record(octet_buf, octet_len);
}
- else if (yaz_oid_is_iso2709(oid))
+ 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))
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");
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);
sr->u.request->facetList = facet_list;
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:
{
Z_AttributeList *al = facet->attributes;
struct yaz_facet_attr attr_values;
- attr_values.errcode = 0;
- attr_values.limit = -1;
- attr_values.useattr = "NONE";
- attr_values.relation = "default";
-
+ yaz_facet_attr_init(&attr_values);
yaz_facet_attr_get_z_attributes(al, &attr_values);
if (!attr_values.errcode)
{
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");
}
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;
}
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);
}
else
{
- int 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"))
sprintf(setstring, "%d", setnumber);
else
*setstring = '\0';
-
+
token_len = check_token(arg_c, "format");
if (token_len)
{
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);
apdu->u.triggerResourceControlRequest;
bool_t rfalse = 0;
char command[16];
-
+
*command = '\0';
sscanf(arg, "%15s", command);
-
+
if (only_z3950())
return 0;
if (session_initResponse &&
*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"))
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);
scan_query = last_scan_query;
scan_term = last_scan_line;
}
- else
+ else
{
strcpy(last_scan_query, arg);
scan_query = arg;
printf("Error use on or off\n");
return 1;
}
-
+
if (auto_reconnect)
printf("Set auto reconnect enabled.\n");
else
fprintf(stderr, "failed to allocate ODR streams\n");
exit(1);
}
-
+
strcpy(scan_position, "1");
setvbuf(stdout, 0, _IONBF, 0);
if (ret == 0 && sr->which == Z_SRW_searchRetrieve_response)
handle_srw_response(sr->u.response);
+ else if (ret == 0 && sr->which == Z_SRW_scan_response)
+ handle_srw_scan_response(sr->u.scan_response);
else
{
- printf("Decoding of SOLR package failed\n");
+ printf("Decoding of Solr package failed\n");
ret = -1;
}
odr_destroy(o);
{
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},
+ 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,
{
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 )
projects / yaz-moved-to-github.git / blobdiff