X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-c.c;h=37b87f969f2a39e2c492a2ace346e1b50f9dbe11;hp=03e6fe3c4efed98ec641c1afeed61973d4510c70;hb=28a4fb36e751de91911b02fa76eba1f1caa284f5;hpb=047d6669724619dd486a9bfa62cde1b909951491 diff --git a/src/zoom-c.c b/src/zoom-c.c index 03e6fe3..37b87f9 100644 --- a/src/zoom-c.c +++ b/src/zoom-c.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. */ /** @@ -96,8 +96,6 @@ int ZOOM_uri_to_code(const char *uri) return code; } - - void ZOOM_set_error(ZOOM_connection c, int error, const char *addinfo) { ZOOM_set_dset_error(c, error, "ZOOM", addinfo, 0); @@ -136,9 +134,6 @@ void ZOOM_connection_show_task(ZOOM_task task) case ZOOM_TASK_SEARCH: yaz_log(YLOG_LOG, "search p=%p", task); break; - case ZOOM_TASK_RETRIEVE: - yaz_log(YLOG_LOG, "retrieve p=%p", task); - break; case ZOOM_TASK_CONNECT: yaz_log(YLOG_LOG, "connect p=%p", task); break; @@ -201,12 +196,6 @@ void ZOOM_connection_remove_task(ZOOM_connection c) xfree(task->u.search.elementSetName); xfree(task->u.search.schema); break; - case ZOOM_TASK_RETRIEVE: - resultset_destroy(task->u.retrieve.resultset); - xfree(task->u.retrieve.syntax); - xfree(task->u.retrieve.elementSetName); - xfree(task->u.retrieve.schema); - break; case ZOOM_TASK_CONNECT: break; case ZOOM_TASK_SCAN: @@ -287,6 +276,7 @@ ZOOM_API(ZOOM_connection) c->user = 0; c->group = 0; c->password = 0; + c->url_authentication = 0; c->maximum_record_size = 0; c->preferred_message_size = 0; @@ -305,7 +295,10 @@ ZOOM_API(ZOOM_connection) c->sru_version = 0; c->no_redirects = 0; + c->cookies = 0; c->saveAPDU_wrbuf = 0; + + ZOOM_memcached_init(c); return c; } @@ -436,15 +429,25 @@ ZOOM_API(void) if (host) { + char hostn[128]; + const char *http_lead; + + val = ZOOM_options_get(c->options, "sru"); + if (val && *val && !strstr(host, "://")) + http_lead = "http://"; + else + http_lead = ""; + c->sru_mode = get_sru_mode_from_string(val); + xfree(c->host_port); if (portnum) { - char hostn[128]; sprintf(hostn, "%.80s:%d", host, portnum); - c->host_port = xstrdup(hostn); + host = hostn; } - else - c->host_port = xstrdup(host); + c->host_port = xmalloc(strlen(host) + strlen(http_lead) + 1); + strcpy(c->host_port, http_lead); + strcat(c->host_port, host); } { @@ -480,9 +483,6 @@ ZOOM_API(void) } } - val = ZOOM_options_get(c->options, "sru"); - c->sru_mode = get_sru_mode_from_string(val); - xfree(c->sru_version); val = ZOOM_options_get(c->options, "sru_version"); c->sru_version = xstrdup(val ? val : "1.2"); @@ -525,10 +525,15 @@ ZOOM_API(void) val = ZOOM_options_get(c->options, "password"); if (!val) val = ZOOM_options_get(c->options, "pass"); - if (val && *val) c->password = xstrdup(val); + val = ZOOM_options_get(c->options, "authenticationMode"); + if (val && !strcmp(val, "url")) + c->url_authentication = 1; + else + c->url_authentication = 0; + c->maximum_record_size = ZOOM_options_get_int(c->options, "maximumRecordSize", 64*1024*1024); c->preferred_message_size = @@ -536,6 +541,14 @@ ZOOM_API(void) c->async = ZOOM_options_get_bool(c->options, "async", 0); + yaz_cookies_destroy(c->cookies); + c->cookies = yaz_cookies_create(); + + if (ZOOM_memcached_configure(c)) + { + ZOOM_connection_remove_tasks(c); + return; + } if (c->sru_mode == zoom_sru_error) { ZOOM_set_error(c, ZOOM_ERROR_UNSUPPORTED_PROTOCOL, val); @@ -555,8 +568,6 @@ ZOOM_API(void) ZOOM_API(void) ZOOM_resultset_release(ZOOM_resultset r) { -#if ZOOM_RESULT_LISTS -#else if (r->connection) { /* remove ourselves from the resultsets in connection */ @@ -573,36 +584,22 @@ ZOOM_API(void) ZOOM_resultset_release(ZOOM_resultset r) } r->connection = 0; } -#endif } ZOOM_API(void) ZOOM_connection_destroy(ZOOM_connection c) { -#if ZOOM_RESULT_LISTS - ZOOM_resultsets list; -#else ZOOM_resultset r; -#endif if (!c) return; yaz_log(c->log_api, "%p ZOOM_connection_destroy", c); + + ZOOM_memcached_destroy(c); if (c->cs) cs_close(c->cs); -#if ZOOM_RESULT_LISTS - /* Remove the connection's usage of resultsets */ - list = c->resultsets; - while (list) { - ZOOM_resultsets removed = list; - ZOOM_resultset_destroy(list->resultset); - list = list->next; - xfree(removed); - } -#else for (r = c->resultsets; r; r = r->next) r->connection = 0; -#endif xfree(c->buf_in); xfree(c->addinfo); @@ -631,6 +628,7 @@ ZOOM_API(void) xfree(c->group); xfree(c->password); xfree(c->sru_version); + yaz_cookies_destroy(c->cookies); wrbuf_destroy(c->saveAPDU_wrbuf); xfree(c); } @@ -678,7 +676,7 @@ ZOOM_resultset ZOOM_resultset_create(void) yaz_log(log_details0, "%p ZOOM_resultset_create", r); r->refcount = 1; r->size = 0; - r->odr = odr_createmem(ODR_ENCODE); + r->odr = odr_createmem(ODR_DECODE); r->piggyback = 1; r->setname = 0; r->step = 0; @@ -689,8 +687,9 @@ ZOOM_resultset ZOOM_resultset_create(void) r->connection = 0; r->databaseNames = 0; r->num_databaseNames = 0; - r->facets = 0; - r->num_facets = 0; + r->req_facets = 0; + r->res_facets = 0; + r->num_res_facets = 0; r->facets_names = 0; r->mutex = 0; yaz_mutex_create(&r->mutex); @@ -701,6 +700,8 @@ ZOOM_resultset ZOOM_resultset_create(void) } #endif resultset_use(1); + r->mc_key = 0; + r->live_set = 0; return r; } @@ -722,19 +723,17 @@ ZOOM_API(ZOOM_resultset) { ZOOM_resultset r = ZOOM_resultset_create(); ZOOM_task task; - const char *cp; int start, count; const char *syntax, *elementSetName, *schema; -#if ZOOM_RESULT_LISTS - ZOOM_resultsets set; -#endif - yaz_log(c->log_api, "%p ZOOM_connection_search set %p query %p", c, r, q); r->r_sort_spec = ZOOM_query_get_sortspec(q); r->query = q; + ZOOM_query_addref(q); r->options = ZOOM_options_create_with_parent(c->options); + r->req_facets = odr_strdup_null(r->odr, + ZOOM_options_get(r->options, "facets")); start = ZOOM_options_get_int(r->options, "start", 0); count = ZOOM_options_get_int(r->options, "count", 0); { @@ -744,26 +743,17 @@ ZOOM_API(ZOOM_resultset) (cp != 0 ? "presentChunk": "step"), 0); } r->piggyback = ZOOM_options_get_bool(r->options, "piggyback", 1); - cp = ZOOM_options_get(r->options, "setname"); - if (cp) - r->setname = xstrdup(cp); - - r->databaseNames = ZOOM_connection_get_databases(c, c->options, &r->num_databaseNames, - r->odr); - + r->setname = odr_strdup_null(r->odr, + ZOOM_options_get(r->options, "setname")); + r->databaseNames = ZOOM_connection_get_databases(c, c->options, + &r->num_databaseNames, + r->odr); r->connection = c; - -#if ZOOM_RESULT_LISTS - yaz_log(log_details, "%p ZOOM_connection_search: Adding new resultset (%p) to resultsets (%p) ", c, r, c->resultsets); - set = xmalloc(sizeof(*set)); - ZOOM_resultset_addref(r); - set->resultset = r; - set->next = c->resultsets; - c->resultsets = set; -#else r->next = c->resultsets; c->resultsets = r; -#endif + + ZOOM_memcached_resultset(r, q); + if (c->host_port && c->proto == PROTO_HTTP) { if (!c->cs) @@ -782,7 +772,6 @@ ZOOM_API(ZOOM_resultset) task->u.search.resultset = r; task->u.search.start = start; task->u.search.count = count; - task->u.search.recv_search_fired = 0; syntax = ZOOM_options_get(r->options, "preferredRecordSyntax"); task->u.search.syntax = syntax ? xstrdup(syntax) : 0; @@ -794,8 +783,6 @@ ZOOM_API(ZOOM_resultset) ZOOM_resultset_addref(r); - ZOOM_query_addref(q); - if (!c->async) { while (ZOOM_event(1, &c)) @@ -883,11 +870,11 @@ static void resultset_destroy(ZOOM_resultset r) ZOOM_query_destroy(r->query); ZOOM_options_destroy(r->options); odr_destroy(r->odr); - xfree(r->setname); yaz_mutex_destroy(&r->mutex); #if SHPTR YAZ_SHPTR_DEC(r->record_wrbuf, wrbuf_destroy); #endif + wrbuf_destroy(r->mc_key); resultset_use(-1); xfree(r); } @@ -948,19 +935,19 @@ static void ZOOM_resultset_retrieve(ZOOM_resultset r, c->reconnect_ok = 1; } } - task = ZOOM_connection_add_task(c, ZOOM_TASK_RETRIEVE); - task->u.retrieve.resultset = r; - task->u.retrieve.start = start; - task->u.retrieve.count = count; + task = ZOOM_connection_add_task(c, ZOOM_TASK_SEARCH); + task->u.search.resultset = r; + task->u.search.start = start; + task->u.search.count = count; syntax = ZOOM_options_get(r->options, "preferredRecordSyntax"); - task->u.retrieve.syntax = syntax ? xstrdup(syntax) : 0; + task->u.search.syntax = syntax ? xstrdup(syntax) : 0; elementSetName = ZOOM_options_get(r->options, "elementSetName"); - task->u.retrieve.elementSetName = elementSetName + task->u.search.elementSetName = elementSetName ? xstrdup(elementSetName) : 0; cp = ZOOM_options_get(r->options, "schema"); - task->u.retrieve.schema = cp ? xstrdup(cp) : 0; + task->u.search.schema = cp ? xstrdup(cp) : 0; ZOOM_resultset_addref(r); @@ -991,37 +978,37 @@ ZOOM_API(void) } ZOOM_API(size_t) - ZOOM_resultset_facets_size(ZOOM_resultset r) { - return r->num_facets; + ZOOM_resultset_facets_size(ZOOM_resultset r) +{ + return r->num_res_facets; } ZOOM_API(ZOOM_facet_field) - ZOOM_resultset_get_facet_field(ZOOM_resultset r, const char *name) { - int num = r->num_facets; - ZOOM_facet_field *facets = r->facets; - int index; - for (index = 0; index < num; index++) { - if (!strcmp(facets[index]->facet_name, name)) { - return facets[index]; - } - } + ZOOM_resultset_get_facet_field(ZOOM_resultset r, const char *name) +{ + int num = r->num_res_facets; + ZOOM_facet_field *facets = r->res_facets; + int i; + for (i = 0; i < num; i++) + if (!strcmp(facets[i]->facet_name, name)) + return facets[i]; return 0; } ZOOM_API(ZOOM_facet_field) - ZOOM_resultset_get_facet_field_by_index(ZOOM_resultset r, int index) { - int num = r->num_facets; - ZOOM_facet_field *facets = r->facets; - if (index >= 0 && index < num) { - return facets[index]; - } + ZOOM_resultset_get_facet_field_by_index(ZOOM_resultset r, int idx) +{ + int num = r->num_res_facets; + ZOOM_facet_field *facets = r->res_facets; + if (idx >= 0 && idx < num) + return facets[idx]; return 0; } ZOOM_API(ZOOM_facet_field *) ZOOM_resultset_facets(ZOOM_resultset r) { - return r->facets; + return r->res_facets; } ZOOM_API(const char**) @@ -1043,7 +1030,8 @@ ZOOM_API(size_t) } ZOOM_API(const char*) - ZOOM_facet_field_get_term(ZOOM_facet_field field, size_t idx, int *freq) { + ZOOM_facet_field_get_term(ZOOM_facet_field field, size_t idx, int *freq) +{ *freq = field->facet_terms[idx].frequency; return field->facet_terms[idx].term; } @@ -1076,7 +1064,7 @@ static zoom_ret do_connect_host(ZOOM_connection c, const char *logical_url) if (c->cs) cs_close(c->cs); - c->cs = cs_create_host_proxy(logical_url, 0, &add, + c->cs = cs_create_host_proxy(logical_url, CS_FLAGS_DNS_NO_BLOCK, &add, c->tproxy ? c->tproxy : c->proxy); if (c->cs && c->cs->protocol == PROTO_HTTP) @@ -1141,7 +1129,7 @@ ZOOM_API(ZOOM_record) const char *schema = ZOOM_options_get(s->options, "schema"); - return ZOOM_record_cache_lookup(s, pos, syntax, elementSetName, schema); + return ZOOM_record_cache_lookup_i(s, pos, syntax, elementSetName, schema); } ZOOM_API(ZOOM_record) @@ -1456,13 +1444,7 @@ ZOOM_API(int) if (c->proto == PROTO_HTTP) ret = ZOOM_connection_srw_send_search(c); else - ret = ZOOM_connection_Z3950_send_search(c); - break; - case ZOOM_TASK_RETRIEVE: - if (c->proto == PROTO_HTTP) - ret = ZOOM_connection_srw_send_search(c); - else - ret = send_Z3950_present(c); + ret = ZOOM_connection_Z3950_search(c); break; case ZOOM_TASK_CONNECT: ret = do_connect(c); @@ -1503,43 +1485,14 @@ ZOOM_API(int) #if YAZ_HAVE_XML2 -static zoom_ret send_HTTP_redirect(ZOOM_connection c, const char *uri, - Z_HTTP_Response *cookie_hres) +static zoom_ret send_HTTP_redirect(ZOOM_connection c, const char *uri) { - struct Z_HTTP_Header *h; - char *combined_cookies = 0; - int combined_cookies_len = 0; Z_GDU *gdu = z_get_HTTP_Request_uri(c->odr_out, uri, 0, c->proxy ? 1 : 0); gdu->u.HTTP_Request->method = odr_strdup(c->odr_out, "GET"); z_HTTP_header_add(c->odr_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(c->odr_out, &gdu->u.HTTP_Request->headers, - "Cookie", combined_cookies); - xfree(combined_cookies); - } - + yaz_cookies_request(c->cookies, c->odr_out, gdu->u.HTTP_Request); if (c->user && c->password) { z_HTTP_header_add_basic_auth(c->odr_out, &gdu->u.HTTP_Request->headers, @@ -1589,6 +1542,7 @@ static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres) ZOOM_connection_set_mask(c, 0); yaz_log(c->log_details, "%p handle_http", c); + yaz_cookies_response(c->cookies, hres); if ((hres->code == 301 || hres->code == 302) && c->sru_mode == zoom_sru_get && (location = z_HTTP_header_lookup(hres->headers, "Location"))) { @@ -1603,9 +1557,14 @@ static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres) { /* since redirect may change host we just reconnect. A smarter implementation might check whether it's the same server */ - do_connect_host(c, location); - send_HTTP_redirect(c, location, hres); - /* we're OK for now. Operation is not really complete */ + + int host_change = 0; + location = yaz_check_location(c->odr_in, c->host_port, + location, &host_change); + if (do_connect_host(c, location) == zoom_complete) + return; /* connect failed.. */ + cs_rcvconnect(c->cs); + send_HTTP_redirect(c, location); return; } } @@ -1936,6 +1895,8 @@ ZOOM_API(const char *) return "Extended Service. invalid version"; case ZOOM_ERROR_ES_INVALID_SYNTAX: return "Extended Service. invalid syntax"; + case ZOOM_ERROR_MEMCACHED: + return "Memcached"; default: return diagbib1_str(error); } @@ -2000,7 +1961,7 @@ static void ZOOM_connection_do_io(ZOOM_connection c, int mask) if (c->cs->io_pending & CS_WANT_READ) mask += ZOOM_SELECT_READ; ZOOM_connection_set_mask(c, mask); - event = ZOOM_Event_create(ZOOM_EVENT_NONE); + event = ZOOM_Event_create(ZOOM_EVENT_CONNECT); ZOOM_connection_put_event(c, event); } else if (ret == 0)