X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=9a00c6384d475b23f9675d0eaf48dc303b5fa110;hp=45eb69dcffe9456530c0c016a6c94cc3a840a686;hb=15cbfd594a64e997955bbecd1aeb95bc854a1217;hpb=f5f832b061784c7a1a996f377ddb27e58fd8311e diff --git a/client/client.c b/client/client.c index 45eb69d..9a00c63 100644 --- a/client/client.c +++ b/client/client.c @@ -62,6 +62,7 @@ #include #include #include +#include #if HAVE_READLINE_READLINE_H #include @@ -104,6 +105,7 @@ static int smallSetUpperBound = 0; static int largeSetLowerBound = 1; static int mediumSetPresentNumber = 0; static Z_ElementSetNames *elementSetNames = 0; +static Z_FacetList *facet_list = 0; static Odr_int setno = 1; /* current set offset */ static enum oid_proto protocol = PROTO_Z3950; /* current app protocol */ #define RECORDSYNTAX_MAX 20 @@ -243,10 +245,14 @@ static void do_hex_dump(const char* buf, size_t len) void add_otherInfos(Z_APDU *a) { Z_OtherInformation **oi; - int i; + int i = 0; yaz_oi_APDU(a, &oi); - for(i=0; i 0) yaz_oi_set_string_oid(oi, out, extraOtherInfos[i].oid, @@ -666,11 +672,10 @@ static int cmd_base(const char *arg) return set_base(arg); } -int session_connect(const char *arg) +static int session_connect_base(const char *arg, const char **basep) { void *add; char type_and_host[101]; - const char *basep = 0; if (conn) { cs_close(conn); @@ -682,7 +687,7 @@ int session_connect(const char *arg) session_mem = NULL; session_initResponse = 0; } - cs_get_host_args(arg, &basep); + cs_get_host_args(arg, basep); strncpy(type_and_host, arg, sizeof(type_and_host)-1); type_and_host[sizeof(type_and_host)-1] = '\0'; @@ -718,11 +723,6 @@ int session_connect(const char *arg) } printf("OK.\n"); cs_print_session_info(conn); - if (basep && *basep) - set_base(basep); - else if (protocol == PROTO_Z3950) - set_base("Default"); - if (protocol == PROTO_Z3950) { send_initRequest(type_and_host); @@ -731,6 +731,19 @@ int session_connect(const char *arg) return 0; } +static int session_connect(const char *arg) +{ + int r; + const char *basep = 0; + + r = session_connect_base(arg, &basep); + if (basep && *basep) + set_base(basep); + else if (protocol == PROTO_Z3950) + set_base("Default"); + return r; +} + int cmd_open(const char *arg) { int r; @@ -739,6 +752,9 @@ int cmd_open(const char *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); @@ -1273,6 +1289,8 @@ static int send_SRW_redirect(const char *uri, Z_HTTP_Response *cookie_hres) const char *username = 0; const char *password = 0; struct Z_HTTP_Header *h; + char *combined_cookies; + int combined_cookies_len = 0; Z_GDU *gdu = get_HTTP_Request_url(out, uri); gdu->u.HTTP_Request->method = odr_strdup(out, "GET"); @@ -1281,9 +1299,24 @@ static int send_SRW_redirect(const char *uri, Z_HTTP_Response *cookie_hres) for (h = cookie_hres->headers; h; h = h->next) { - if (!strcmp(h->name, "Set-Cookie")) - z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, - "Cookie", h->value); + if (!strcmp(h->name, "Set-Cookie")) { + char *cp; + + if (!(cp = strchr(h->value, ';'))) + cp = h->value + strlen(h->value); + if (cp - h->value >= 1) { + combined_cookies = xrealloc(combined_cookies, combined_cookies_len + cp - h->value + 3); + memcpy(combined_cookies+combined_cookies_len, h->value, cp - h->value); + combined_cookies[combined_cookies_len + cp - h->value] = '\0'; + strcat(combined_cookies,"; "); + combined_cookies_len = strlen(combined_cookies); + } + } + } + if (combined_cookies_len) + { + z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, "Cookie", combined_cookies); + xfree(combined_cookies); } if (auth) @@ -1579,6 +1612,24 @@ static int send_searchRequest(const char *arg) 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) { @@ -1590,25 +1641,72 @@ 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) - { - 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_term(term); + } + } +} + +static void display_facet(Z_FacetField *facet) { + if (facet->attributes) { + Z_AttributeList *al = facet->attributes; + struct attrvalues attr_values; + attr_values.errcode = 0; + attr_values.limit = -1; + attr_values.useattr = 0; + attr_values.relation = "default"; + + facetattrs(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); + for (term_index = 0 ; term_index < facet->num_terms; term_index++) { + Z_FacetTerm *facetTerm = facet->terms[term_index]; + display_term(facetTerm->term); + printf(" (" NMEM_INT_PRINTF ")\n", *facetTerm->count); } } + } } +static void* display_facets(Z_FacetList *fl) +{ + int index; + printf("Facets(%d): \n", fl->num); + + for (index = 0; index < fl->num ; index++) { + display_facet(fl->elements[index]); + } + return 0; +} + +void display_searchResult1(Z_SearchInfoReport *sr) +{ + int j; + printf("SearchResult-1:"); + for (j = 0; j < sr->num; j++) + { + if (j) + printf(","); + if (!sr->elements[j]->subqueryExpression) + printf("%d", j); + display_queryExpression("term", + sr->elements[j]->subqueryExpression); + display_queryExpression("interpretation", + sr->elements[j]->subqueryInterpretation); + display_queryExpression("recommendation", + sr->elements[j]->subqueryRecommendation); + if (sr->elements[j]->subqueryCount) + printf(" cnt=" ODR_INT_PRINTF, + *sr->elements[j]->subqueryCount); + if (sr->elements[j]->subqueryId) + printf(" id=%s ", sr->elements[j]->subqueryId); + } + printf("\n"); +} + + + /* see if we can find USR:SearchResult-1 */ static void display_searchResult(Z_OtherInformation *o) { @@ -1622,30 +1720,9 @@ static void display_searchResult(Z_OtherInformation *o) Z_External *ext = o->list[i]->information.externallyDefinedInfo; if (ext->which == Z_External_searchResult1) - { - int j; - Z_SearchInfoReport *sr = ext->u.searchResult1; - printf("SearchResult-1:"); - for (j = 0; j < sr->num; j++) - { - if (j) - printf(","); - if (!sr->elements[j]->subqueryExpression) - printf("%d", j); - display_queryExpression("term", - sr->elements[j]->subqueryExpression); - display_queryExpression("interpretation", - sr->elements[j]->subqueryInterpretation); - display_queryExpression("recommendation", - sr->elements[j]->subqueryRecommendation); - if (sr->elements[j]->subqueryCount) - printf(" cnt=" ODR_INT_PRINTF, - *sr->elements[j]->subqueryCount); - if (sr->elements[j]->subqueryId) - printf(" id=%s ", sr->elements[j]->subqueryId); - } - printf("\n"); - } + display_searchResult1(ext->u.searchResult1); + else if (ext->which == Z_External_userFacets) + display_facets(ext->u.facetList); } } } @@ -2781,6 +2858,37 @@ static int cmd_find(const char *arg) return 2; } +static int cmd_facets(const char *arg) +{ + int size = 0; + if (!*arg) + { + facet_list = 0; + printf("Facets cleared.\n"); + return 0; + } + size = strlen(arg); + if (only_z3950()) + { + printf("Currently only supported for Z39.50.\n"); + 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; +} + + static int cmd_delete(const char *arg) { if (only_z3950()) @@ -2843,6 +2951,7 @@ static int parse_show_args(const char *arg_c, char *setstring, Odr_int *start, Odr_int *number) { char *end_ptr; + Odr_int start_position; if (setnumber >= 0) sprintf(setstring, "%d", setnumber); @@ -2854,8 +2963,11 @@ static int parse_show_args(const char *arg_c, char *setstring, *number = last_hit_count; *start = 1; } - *start = odr_strtol(arg_c, &end_ptr, 10); - if (end_ptr == arg_c || *end_ptr == '\0') + start_position = odr_strtol(arg_c, &end_ptr, 10); + if (end_ptr == arg_c) + return 1; + *start = start_position; + if (*end_ptr == '\0') return 1; while (isspace(*(unsigned char *)end_ptr)) end_ptr++; @@ -3161,6 +3273,7 @@ int send_scanrequest(const char *set, const char *query, { YAZ_PQF_Parser pqf_parser = yaz_pqf_create(); + if (!(req->termListAndStartPoint = yaz_pqf_scan(pqf_parser, out, &req->attributeSet, query))) { @@ -3252,7 +3365,7 @@ int send_sortrequest(const char *arg, int newset) return 2; } -void display_term(Z_TermInfo *t) +void display_term_info(Z_TermInfo *t) { if (t->displayTerm) printf("%s", t->displayTerm); @@ -3294,7 +3407,7 @@ void process_scanResponse(Z_ScanResponse *res) 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); @@ -4422,7 +4535,8 @@ static void wait_and_handle_response(int one_response_only) && !yaz_matchstr(sru_method, "get") && (location = z_HTTP_header_lookup(hres->headers, "Location"))) { - session_connect(location); + const char *base_tmp; + session_connect_base(location, &base_tmp); no_redirects++; if (conn) { @@ -4723,6 +4837,7 @@ static struct { {"open", cmd_open, "('tcp'|'ssl')':[':'][/]",NULL,0,NULL}, {"quit", cmd_quit, "",NULL,0,NULL}, {"find", cmd_find, "",NULL,0,NULL}, + {"facets", cmd_facets, "",NULL,0,NULL}, {"delete", cmd_delete, "",NULL,0,NULL}, {"base", cmd_base, "",NULL,0,NULL}, {"show", cmd_show, "['+'<#recs>['+']]",NULL,0,NULL},