/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2012 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
return code;
}
-
-
void ZOOM_set_error(ZOOM_connection c, int error, const char *addinfo)
{
ZOOM_set_dset_error(c, error, "ZOOM", addinfo, 0);
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;
resultset_destroy(task->u.search.resultset);
xfree(task->u.search.syntax);
xfree(task->u.search.elementSetName);
- break;
- case ZOOM_TASK_RETRIEVE:
- resultset_destroy(task->u.retrieve.resultset);
- xfree(task->u.retrieve.syntax);
- xfree(task->u.retrieve.elementSetName);
+ xfree(task->u.search.schema);
break;
case ZOOM_TASK_CONNECT:
break;
c->user = 0;
c->group = 0;
c->password = 0;
+ c->url_authentication = 0;
c->maximum_record_size = 0;
c->preferred_message_size = 0;
c->sru_version = 0;
c->no_redirects = 0;
+ c->cookies = 0;
+ c->saveAPDU_wrbuf = 0;
+
+ ZOOM_memcached_init(c);
return c;
}
const char *cp = ZOOM_options_get(options, "databaseName");
if ((!cp || !*cp) && con->host_port)
- {
- if (strncmp(con->host_port, "unix:", 5) == 0)
- cp = strchr(con->host_port+5, ':');
- else
- cp = strchr(con->host_port, '/');
- if (cp)
- cp++;
- }
+ cs_get_host_args(con->host_port, &cp);
if (!cp || !*cp)
cp = "Default";
nmem_strsplit(odr_getmem(odr), "+", cp, &databaseNames, num);
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);
}
{
}
}
- 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");
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 =
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);
ZOOM_API(void) ZOOM_resultset_release(ZOOM_resultset r)
{
-#if ZOOM_RESULT_LISTS
-#else
if (r->connection)
{
/* remove ourselves from the resultsets in connection */
}
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);
xfree(c->group);
xfree(c->password);
xfree(c->sru_version);
+ yaz_cookies_destroy(c->cookies);
+ wrbuf_destroy(c->saveAPDU_wrbuf);
xfree(c);
}
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->schema = 0;
r->step = 0;
for (i = 0; i<RECORD_HASH_SIZE; i++)
r->record_hash[i] = 0;
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);
}
#endif
resultset_use(1);
+ r->mc_key = 0;
+ r->live_set = 0;
return r;
}
{
ZOOM_resultset r = ZOOM_resultset_create();
ZOOM_task task;
- const char *cp;
int start, count;
- const char *syntax, *elementSetName;
-#if ZOOM_RESULT_LISTS
- ZOOM_resultsets set;
-#endif
-
+ const char *syntax, *elementSetName, *schema;
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);
{
(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);
- cp = ZOOM_options_get(r->options, "schema");
- if (cp)
- r->schema = 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)
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;
elementSetName = ZOOM_options_get(r->options, "elementSetName");
- task->u.search.elementSetName = elementSetName
- ? xstrdup(elementSetName) : 0;
+ task->u.search.elementSetName = elementSetName ?
+ xstrdup(elementSetName) : 0;
+ schema = ZOOM_options_get(r->options, "schema");
+ task->u.search.schema = schema ? xstrdup(schema) : 0;
ZOOM_resultset_addref(r);
- ZOOM_query_addref(q);
-
if (!c->async)
{
while (ZOOM_event(1, &c))
ZOOM_query_destroy(r->query);
ZOOM_options_destroy(r->options);
odr_destroy(r->odr);
- xfree(r->setname);
- xfree(r->schema);
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);
}
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");
- if (cp)
- {
- if (!r->schema || strcmp(r->schema, cp))
- {
- xfree(r->schema);
- r->schema = xstrdup(cp);
- }
- }
+ task->u.search.schema = cp ? xstrdup(cp) : 0;
ZOOM_resultset_addref(r);
}
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**)
}
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;
}
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)
ZOOM_options_get(s->options, "preferredRecordSyntax");
const char *elementSetName =
ZOOM_options_get(s->options, "elementSetName");
+ const char *schema =
+ ZOOM_options_get(s->options, "schema");
- return ZOOM_record_cache_lookup(s, pos, syntax, elementSetName);
+ return ZOOM_record_cache_lookup_i(s, pos, syntax, elementSetName, schema);
}
ZOOM_API(ZOOM_record)
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);
#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,
c->user, c->password);
}
- if (!z_GDU(c->odr_out, &gdu, 0, 0))
+ return ZOOM_send_GDU(c, gdu);
+}
+
+zoom_ret ZOOM_send_GDU(ZOOM_connection c, Z_GDU *gdu)
+{
+ ZOOM_Event event;
+
+ int r = z_GDU(c->odr_out, &gdu, 0, 0);
+ if (!r)
return zoom_complete;
if (c->odr_print)
z_GDU(c->odr_print, &gdu, 0, 0);
if (c->odr_save)
z_GDU(c->odr_save, &gdu, 0, 0);
c->buf_out = odr_getbuf(c->odr_out, &c->len_out, 0);
-
odr_reset(c->odr_out);
+
+ event = ZOOM_Event_create(ZOOM_EVENT_SEND_APDU);
+ ZOOM_connection_put_event(c, event);
+
return ZOOM_send_buf(c);
}
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")))
{
{
/* 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.. */
+ send_HTTP_redirect(c, location);
return;
}
}
ZOOM_API(const char *)
ZOOM_connection_option_get(ZOOM_connection c, const char *key)
{
- return ZOOM_options_get(c->options, key);
+ if (!strcmp(key, "APDU"))
+ {
+ return c->saveAPDU_wrbuf ? wrbuf_cstr(c->saveAPDU_wrbuf) : "";
+ }
+ else
+ return ZOOM_options_get(c->options, key);
}
ZOOM_API(const char *)
ZOOM_connection_option_getl(ZOOM_connection c, const char *key, int *lenp)
{
- return ZOOM_options_getl(c->options, key, lenp);
+ if (!strcmp(key, "APDU"))
+ {
+ if (c->saveAPDU_wrbuf)
+ {
+ *lenp = wrbuf_len(c->saveAPDU_wrbuf);
+ return wrbuf_cstr(c->saveAPDU_wrbuf);
+ }
+ else
+ {
+ *lenp = 0;
+ return "";
+ }
+ }
+ else
+ return ZOOM_options_getl(c->options, key, lenp);
}
ZOOM_API(void)
ZOOM_connection_option_set(ZOOM_connection c, const char *key,
const char *val)
{
- ZOOM_options_set(c->options, key, val);
+ if (!strcmp(key, "saveAPDU"))
+ {
+ if (val && strcmp(val, "0"))
+ {
+ if (!c->saveAPDU_wrbuf)
+ c->saveAPDU_wrbuf = wrbuf_alloc();
+ else
+ wrbuf_rewind(c->saveAPDU_wrbuf);
+ }
+ else
+ {
+ wrbuf_destroy(c->saveAPDU_wrbuf);
+ c->saveAPDU_wrbuf = 0;
+ }
+ ZOOM_connection_save_apdu_wrbuf(c, c->saveAPDU_wrbuf);
+ }
+ else
+ ZOOM_options_set(c->options, key, val);
}
ZOOM_API(void)
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);
}
projects / yaz-moved-to-github.git / blobdiff