}
}
-void ZOOM_connection_remove_tasks(ZOOM_connection c);
+static zoom_ret send_HTTP_redirect(ZOOM_connection c, const char *uri);
void ZOOM_set_dset_error(ZOOM_connection c, int error,
const char *dset,
c, c->host_port ? c->host_port : "<>", dset, error,
addinfo ? addinfo : "",
addinfo2 ? addinfo2 : "");
- ZOOM_connection_remove_tasks(c);
}
}
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;
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:
c->host_port = 0;
c->proxy = 0;
c->tproxy = 0;
+ c->proxy_mode = 0;
c->charset = c->lang = 0;
c->sru_version = 0;
c->no_redirects = 0;
c->cookies = 0;
+ c->location = 0;
c->saveAPDU_wrbuf = 0;
-#if HAVE_LIBMEMCACHED_MEMCACHED_H
- c->mc_st = 0;
-#endif
+ ZOOM_memcached_init(c);
return c;
}
ZOOM_set_error(c, ZOOM_ERROR_NONE, 0);
ZOOM_connection_remove_tasks(c);
- if (c->odr_print)
- {
- odr_setprint(c->odr_print, 0); /* prevent destroy from fclose'ing */
- odr_destroy(c->odr_print);
- }
- if (ZOOM_options_get_bool(c->options, "apdulog", 0))
- {
- c->odr_print = odr_createmem(ODR_PRINT);
- odr_setprint(c->odr_print, yaz_log_file());
- }
- else
- c->odr_print = 0;
-
if (c->cs)
{
yaz_log(c->log_details, "%p ZOOM_connection_connect reconnect ok", c);
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");
yaz_cookies_destroy(c->cookies);
c->cookies = yaz_cookies_create();
-#if HAVE_LIBMEMCACHED_MEMCACHED_H
- if (c->mc_st)
- {
- memcached_free(c->mc_st);
- c->mc_st = 0;
- }
-#endif
- val = ZOOM_options_get(c->options, "memcached");
- if (val && *val)
+ if (ZOOM_memcached_configure(c))
{
-#if HAVE_LIBMEMCACHED_MEMCACHED_H
- c->mc_st = memcached(val, strlen(val));
- if (!c->mc_st)
- {
- ZOOM_set_error(c, ZOOM_ERROR_MEMCACHED, val);
- return;
- }
-#else
- ZOOM_set_error(c, ZOOM_ERROR_MEMCACHED, "not enabled");
+ ZOOM_connection_remove_tasks(c);
return;
-#endif
}
-
if (c->sru_mode == zoom_sru_error)
{
ZOOM_set_error(c, ZOOM_ERROR_UNSUPPORTED_PROTOCOL, val);
return;
}
+ if (c->odr_print)
+ odr_destroy(c->odr_print);
+ c->odr_print = 0;
+ val = ZOOM_options_get(c->options, "apdufile");
+ if (val)
+ {
+ c->odr_print = odr_createmem(ODR_PRINT);
+ if (strcmp(val, "-"))
+ {
+ FILE *f = fopen(val, "a");
+ if (!f)
+ {
+ WRBUF w = wrbuf_alloc();
+ wrbuf_printf(w, "fopen: %s", val);
+ ZOOM_set_error(c, ZOOM_ERROR_INTERNAL, wrbuf_cstr(w));
+ wrbuf_destroy(w);
+ return;
+ }
+ odr_setprint(c->odr_print, f);
+ }
+ }
+ else if (ZOOM_options_get_bool(c->options, "apdulog", 0))
+ {
+ c->odr_print = odr_createmem(ODR_PRINT);
+ odr_setprint_noclose(c->odr_print, yaz_log_file());
+ }
+
yaz_log(c->log_details, "%p ZOOM_connection_connect async=%d", c, c->async);
ZOOM_connection_add_task(c, ZOOM_TASK_CONNECT);
return;
yaz_log(c->log_api, "%p ZOOM_connection_destroy", c);
-#if HAVE_LIBMEMCACHED_MEMCACHED_H
- if (c->mc_st)
- memcached_free(c->mc_st);
-#endif
+ ZOOM_memcached_destroy(c);
if (c->cs)
cs_close(c->cs);
if (c->odr_save)
odr_destroy(c->odr_save);
if (c->odr_print)
- {
- odr_setprint(c->odr_print, 0); /* prevent destroy from fclose'ing */
odr_destroy(c->odr_print);
- }
ZOOM_options_destroy(c->options);
ZOOM_connection_remove_tasks(c);
ZOOM_connection_remove_events(c);
xfree(c->group);
xfree(c->password);
xfree(c->sru_version);
+ xfree(c->location);
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->step = 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_connection_search(ZOOM_connection c, ZOOM_query q)
{
ZOOM_resultset r = ZOOM_resultset_create();
- const char *cp;
ZOOM_task task;
int start, count;
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);
-
- 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;
r->next = c->resultsets;
c->resultsets = r;
-#if HAVE_LIBMEMCACHED_MEMCACHED_H
- r->mc_key = wrbuf_alloc();
- wrbuf_puts(r->mc_key, c->host_port);
- wrbuf_puts(r->mc_key, ";");
- wrbuf_puts(r->mc_key, ZOOM_query_get_query_string(q));
- if (c->mc_st)
- {
- size_t v_len;
- uint32_t flags;
- memcached_return_t rc;
- char *v = memcached_get(c->mc_st, wrbuf_buf(r->mc_key),
- wrbuf_len(r->mc_key), &v_len, &flags, &rc);
- if (v)
- {
- yaz_log(YLOG_LOG, "For key %s got value %.*s",
- wrbuf_cstr(r->mc_key), (int) v_len, v);
- }
- else
- {
- yaz_log(YLOG_LOG, "For key %s got NO value", wrbuf_cstr(r->mc_key));
- }
- }
-#endif
+ ZOOM_memcached_resultset(r, q);
if (c->host_port && c->proto == PROTO_HTTP)
{
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;
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);
yaz_mutex_destroy(&r->mutex);
#if SHPTR
YAZ_SHPTR_DEC(r->record_wrbuf, wrbuf_destroy);
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);
}
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->tproxy ? c->tproxy : c->proxy);
+ c->cs = cs_create_host2(logical_url, CS_FLAGS_DNS_NO_BLOCK, &add,
+ c->tproxy ? c->tproxy : c->proxy,
+ &c->proxy_mode);
+ if (!c->proxy)
+ c->proxy_mode = 0;
if (c->cs && c->cs->protocol == PROTO_HTTP)
{
assert(c->tasks->which == ZOOM_TASK_CONNECT);
ZOOM_connection_remove_task(c);
ZOOM_connection_set_mask(c, 0);
- ZOOM_connection_exec_task(c);
+
+ if (c->cs && c->location)
+ send_HTTP_redirect(c, c->location);
+ else
+ ZOOM_connection_exec_task(c);
}
c->state = STATE_ESTABLISHED;
return zoom_pending;
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)
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);
return 1;
}
-#if YAZ_HAVE_XML2
static zoom_ret send_HTTP_redirect(ZOOM_connection c, const char *uri)
{
z_HTTP_header_add_basic_auth(c->odr_out, &gdu->u.HTTP_Request->headers,
c->user, c->password);
}
+ xfree(c->location);
+ c->location = 0;
return ZOOM_send_GDU(c, gdu);
}
+
zoom_ret ZOOM_send_GDU(ZOOM_connection c, Z_GDU *gdu)
{
ZOOM_Event event;
return ZOOM_send_buf(c);
}
-#if YAZ_HAVE_XML2
void ZOOM_set_HTTP_error(ZOOM_connection c, int error,
const char *addinfo, const char *addinfo2)
{
ZOOM_set_dset_error(c, error, "HTTP", addinfo, addinfo2);
}
-#endif
-
+#if YAZ_HAVE_XML2
static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres)
{
zoom_ret cret = zoom_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);
+ xfree(c->location);
+ c->location = xstrdup(location);
+ do_connect_host(c, location);
return;
}
}
if (!z_GDU(c->odr_in, &gdu, 0, 0))
{
- int x;
- int err = odr_geterrorx(c->odr_in, &x);
- char msg[100];
- const char *element = odr_getelement(c->odr_in);
- yaz_snprintf(msg, sizeof(msg),
- "ODR code %d:%d element=%s offset=%d",
- err, x, element ? element : "<unknown>",
- odr_offset(c->odr_in));
- ZOOM_set_error(c, ZOOM_ERROR_DECODE, msg);
- if (c->log_api)
+ /* even on failures we try to re-connect (HTTP) */
+ if (!ZOOM_test_reconnect(c))
{
- FILE *ber_file = yaz_log_file();
- if (ber_file)
- odr_dumpBER(ber_file, c->buf_in, r);
+ int x;
+ int err = odr_geterrorx(c->odr_in, &x);
+ char msg[100];
+ const char *element = odr_getelement(c->odr_in);
+ yaz_snprintf(msg, sizeof(msg),
+ "ODR code %d:%d element=%s offset=%d",
+ err, x, element ? element : "<unknown>",
+ odr_offset(c->odr_in));
+ ZOOM_set_error(c, ZOOM_ERROR_DECODE, msg);
+ if (c->log_api)
+ {
+ FILE *ber_file = yaz_log_file();
+ if (ber_file)
+ odr_dumpBER(ber_file, c->buf_in, r);
+ }
+ ZOOM_connection_close(c);
}
- ZOOM_connection_close(c);
}
else
{
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)
else
{
/* no init request for SRW .. */
- assert(c->tasks->which == ZOOM_TASK_CONNECT);
- ZOOM_connection_remove_task(c);
- ZOOM_connection_set_mask(c, 0);
- ZOOM_connection_exec_task(c);
+ if (c->tasks->which == ZOOM_TASK_CONNECT)
+ {
+ ZOOM_connection_remove_task(c);
+ ZOOM_connection_set_mask(c, 0);
+ }
+ if (c->cs && c->location)
+ send_HTTP_redirect(c, c->location);
+ else
+ ZOOM_connection_exec_task(c);
}
c->state = STATE_ESTABLISHED;
}
projects / yaz-moved-to-github.git / blobdiff