X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=596b76ad9fe0c4ad8075c5ef0945e5eeae8c7c51;hp=925c503c93bc14e1e2e12cc5dd3d446031ae1584;hb=7fbf3f2eceeb0978881992fbf1e77cd6fc3c4a9b;hpb=1331fd610a8bfc1e5a849d2c4d598c11557a8372 diff --git a/client/client.c b/client/client.c index 925c503..596b76a 100644 --- a/client/client.c +++ b/client/client.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2013 Index Data + * Copyright (C) Index Data * See the file LICENSE for details. */ /** \file client.c @@ -64,6 +64,7 @@ #include #include #include +#include #if HAVE_READLINE_READLINE_H #include @@ -83,6 +84,7 @@ static file_history_t file_history = 0; 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; @@ -102,9 +104,9 @@ char *databaseNames[128]; 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; @@ -144,10 +146,11 @@ static int z3950_version = 3; static int scan_stepSize = 0; static char scan_position[64]; static int scan_size = 20; -static char cur_host[200]; +static WRBUF cur_host = 0; static Odr_int last_hit_count = 0; static int pretty_xml = 0; static Odr_int sru_maximumRecords = 0; +static yaz_cookies_t yaz_cookies = 0; typedef enum { QueryType_Prefix, @@ -252,9 +255,12 @@ static void add_otherInfos(Z_APDU *a) 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) @@ -317,14 +323,9 @@ static void print_refid(Z_ReferenceId *id) 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 ------------------------------- */ @@ -738,12 +739,15 @@ static int session_connect_base(const char *arg, const char **basep) return 0; } -static int session_connect(const char *arg) +static int session_connect(void) { int r; const char *basep = 0; - r = session_connect_base(arg, &basep); + yaz_cookies_destroy(yaz_cookies); + yaz_cookies = yaz_cookies_create(); + + r = session_connect_base(wrbuf_cstr(cur_host), &basep); if (basep && *basep) set_base(basep); else if (protocol == PROTO_Z3950) @@ -756,15 +760,16 @@ 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; + wrbuf_rewind(cur_host); + if (!strstr(arg, "://") && strcmp(sru_method, "soap")) + wrbuf_puts(cur_host, "http://"); + wrbuf_puts(cur_host, arg); } set_base(""); - r = session_connect(cur_host); + r = session_connect(); if (conn && conn->protocol == PROTO_HTTP) queryType = QueryType_CQL; - return r; } @@ -842,6 +847,50 @@ static void print_record(const char *buf, size_t len) 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; @@ -927,7 +976,10 @@ static void display_record(Z_External *r) || !oid_oidcmp(oid, yaz_oid_recsyn_html)) { print_xml_record(octet_buf, octet_len); - + } + else if (!oid_oidcmp(oid, yaz_oid_recsyn_mab)) + { + print_mab_record(octet_buf, octet_len); } else { @@ -1312,46 +1364,20 @@ static int send_srw_host_path(Z_SRW_PDU *sr, const char *host_port, static int send_srw(Z_SRW_PDU *sr) { char *path = yaz_encode_sru_dbpath_odr(out, databaseNames[0]); - return send_srw_host_path(sr, cur_host, path); + return send_srw_host_path(sr, wrbuf_cstr(cur_host), path); } -static int send_SRW_redirect(const char *uri, Z_HTTP_Response *cookie_hres) +static int send_SRW_redirect(const char *uri) { const char *username = 0; const char *password = 0; - struct Z_HTTP_Header *h; - char *combined_cookies = 0; - int combined_cookies_len = 0; Z_GDU *gdu = get_HTTP_Request_url(out, uri); gdu->u.HTTP_Request->method = odr_strdup(out, "GET"); z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, "Accept", "text/xml"); - for (h = cookie_hres->headers; h; h = h->next) - { - if (!strcmp(h->name, "Set-Cookie")) - { - char *cp; - - if (!(cp = strchr(h->value, ';'))) - cp = h->value + strlen(h->value); - if (cp - h->value >= 1) - { - combined_cookies = xrealloc(combined_cookies, combined_cookies_len + cp - h->value + 3); - memcpy(combined_cookies+combined_cookies_len, h->value, cp - h->value); - combined_cookies[combined_cookies_len + cp - h->value] = '\0'; - strcat(combined_cookies,"; "); - combined_cookies_len = strlen(combined_cookies); - } - } - } - if (combined_cookies_len) - { - z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, "Cookie", combined_cookies); - xfree(combined_cookies); - } - + yaz_cookies_request(yaz_cookies, out, gdu->u.HTTP_Request); if (auth) { if (auth->which == Z_IdAuthentication_open) @@ -1473,11 +1499,12 @@ static int send_SRW_searchRequest(const char *arg) 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; - 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); @@ -1557,12 +1584,12 @@ static int send_Z3950_searchRequest(const char *arg) 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; } @@ -1616,7 +1643,7 @@ static int send_Z3950_searchRequest(const char *arg) 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: @@ -1864,7 +1891,7 @@ static void print_referenceId(int iLevel, Z_ReferenceId *referenceId) 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"); @@ -2126,16 +2153,8 @@ static Z_External *create_external_itemRequest(void) 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; @@ -2179,18 +2198,8 @@ static Z_External *create_external_ILL_APDU(void) 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; } @@ -2379,7 +2388,7 @@ static int send_SRW_update(int action_no, const char *recid, char *rec_buf, int rec_len) { if (!conn) - session_connect(cur_host); + session_connect(); if (!conn) return 0; else @@ -2479,16 +2488,8 @@ static int send_Z3950_update(int version, int action_no, const char *recid, 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; @@ -2526,16 +2527,8 @@ static int send_Z3950_update(int version, int action_no, const char *recid, 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; @@ -2579,7 +2572,7 @@ static int cmd_xmles(const char *arg) &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); @@ -2657,7 +2650,7 @@ static int cmd_explain(const char *arg) return 0; #if YAZ_HAVE_XML2 if (!conn) - session_connect(cur_host); + session_connect(); if (conn) { Z_SRW_PDU *sr = 0; @@ -2665,7 +2658,7 @@ static int cmd_explain(const char *arg) 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"; @@ -2680,12 +2673,14 @@ static int cmd_init(const char *arg) { if (*arg) { - strncpy(cur_host, arg, sizeof(cur_host)-1); - cur_host[sizeof(cur_host)-1] = 0; + wrbuf_rewind(cur_host); + if (!strstr(arg, "://") && strcmp(sru_method, "soap")) + wrbuf_puts(cur_host, "http://"); + wrbuf_puts(cur_host, arg); } if (only_z3950()) return 1; - send_Z3950_initRequest(cur_host); + send_Z3950_initRequest(wrbuf_cstr(cur_host)); return 2; } @@ -2822,7 +2817,8 @@ static int cmd_sru(const char *arg) } 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")) @@ -2855,7 +2851,7 @@ static int cmd_find(const char *arg) { #if YAZ_HAVE_XML2 if (!conn) - session_connect(cur_host); + session_connect(); if (!conn) return 0; if (!send_SRW_searchRequest(arg)) @@ -2866,7 +2862,7 @@ static int cmd_find(const char *arg) } else { - if (*cur_host && auto_reconnect) + if (wrbuf_len(cur_host) && auto_reconnect) { int i = 0; for (;;) @@ -2884,7 +2880,7 @@ static int cmd_find(const char *arg) printf("Unable to reconnect\n"); break; } - session_connect(cur_host); + session_connect(); wait_and_handle_response(0); } return 0; @@ -2935,30 +2931,30 @@ static int cmd_delete(const char *arg) 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; } @@ -3165,11 +3161,12 @@ static int send_SRW_presentRequest(const char *arg) 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); @@ -3226,7 +3223,7 @@ static int cmd_show(const char *arg) { #if YAZ_HAVE_XML2 if (!conn) - session_connect(cur_host); + session_connect(); if (!conn) return 0; if (!send_SRW_presentRequest(arg)) @@ -3250,9 +3247,15 @@ static int cmd_show(const char *arg) static void exit_client(int code) { + odr_destroy(in); + odr_destroy(out); + odr_destroy(print); + ccl_qual_rm(&bibset); + yaz_cookies_destroy(yaz_cookies); file_history_save(file_history); file_history_destroy(&file_history); nmem_destroy(nmem_auth); + wrbuf_destroy(cur_host); exit(code); } @@ -3381,10 +3384,8 @@ static int send_Z3950_scanrequest(const char *set, const char *query, 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); @@ -3616,7 +3617,7 @@ static int cmd_scan_common(const char *set, const char *arg) { #if YAZ_HAVE_XML2 if (!conn) - session_connect(cur_host); + session_connect(); if (!conn) return 0; if (send_SRW_scanRequest(scan_query, pos_p, scan_size) < 0) @@ -3628,9 +3629,9 @@ static int cmd_scan_common(const char *set, const char *arg) } else { - if (*cur_host && !conn && auto_reconnect) + if (wrbuf_len(cur_host) && !conn && auto_reconnect) { - session_connect(cur_host); + session_connect(); wait_and_handle_response(0); } if (!conn) @@ -4261,6 +4262,8 @@ static void initialize(const char *rc_file) FILE *inf; int i; + cur_host = wrbuf_alloc(); + if (!(out = odr_createmem(ODR_ENCODE)) || !(in = odr_createmem(ODR_DECODE)) || !(print = odr_createmem(ODR_PRINT))) @@ -4315,10 +4318,7 @@ struct timeval tv_start; static void handle_srw_record(Z_SRW_record *rec) { if (rec->recordPosition) - { printf("pos=" ODR_INT_PRINTF, *rec->recordPosition); - setno = *rec->recordPosition + 1; - } if (rec->recordSchema) printf(" schema=%s", rec->recordSchema); printf("\n"); @@ -4372,6 +4372,7 @@ static void handle_srw_response(Z_SRW_searchRetrieveResponse *res) } handle_srw_record(res->records + i); } + setno += res->num_records; } static void handle_srw_scan_term(Z_SRW_scanTerm *term) @@ -4452,9 +4453,10 @@ static void http_response(Z_HTTP_Response *hres) 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_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}, + {"searchRetrieveResponse", 0, (Z_SOAP_fun) yaz_srw_codec}, {0, 0, 0} }; ret = z_soap_codec(o, &soap_package, @@ -4517,7 +4519,7 @@ static void http_response(Z_HTTP_Response *hres) } #endif -#define max_HTTP_redirects 2 +#define max_HTTP_redirects 3 static void wait_and_handle_response(int one_response_only) { @@ -4539,7 +4541,7 @@ static void wait_and_handle_response(int one_response_only) { cs_close(conn); conn = 0; - session_connect(cur_host); + session_connect(); reconnect_ok = 0; if (conn) { @@ -4654,17 +4656,23 @@ static void wait_and_handle_response(int one_response_only) Z_HTTP_Response *hres = gdu->u.HTTP_Response; int code = hres->code; const char *location = 0; + + yaz_cookies_response(yaz_cookies, hres); if ((code == 301 || code == 302) && no_redirects < max_HTTP_redirects && !yaz_matchstr(sru_method, "get") && (location = z_HTTP_header_lookup(hres->headers, "Location"))) { const char *base_tmp; - session_connect_base(location, &base_tmp); + int host_change = 0; + location = yaz_check_location(in, wrbuf_cstr(cur_host), + location, &host_change); + if (host_change) + session_connect_base(location, &base_tmp); no_redirects++; if (conn) { - if (send_SRW_redirect(location, hres) == 2) + if (send_SRW_redirect(location) == 2) continue; } printf("Redirect failed\n"); @@ -4838,9 +4846,9 @@ static int cmd_list_all(const char* args) /* connection options */ if (conn) - printf("Connected to : %s\n", cur_host); - else if (*cur_host) - printf("Not connected to : %s\n", cur_host); + printf("Connected to : %s\n", wrbuf_cstr(cur_host)); + else if (cur_host && wrbuf_len(cur_host)) + printf("Not connected to : %s\n", wrbuf_cstr(cur_host)); else printf("Not connected : \n"); if (yazProxy) printf("using proxy : %s\n",yazProxy); @@ -4884,7 +4892,9 @@ static int cmd_list_all(const char* args) 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)