const char *host, int portnum)
{
const char *val;
- const char *http_lead;
initlog();
else
c->lang = 0;
- 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);
-
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)
{
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);
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;
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;
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);
ZOOM_API(size_t)
ZOOM_resultset_facets_size(ZOOM_resultset r)
{
- return r->num_facets;
+ 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 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))
ZOOM_API(ZOOM_facet_field)
ZOOM_resultset_get_facet_field_by_index(ZOOM_resultset r, int idx)
{
- int num = r->num_facets;
- ZOOM_facet_field *facets = r->facets;
+ 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**)
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)
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)
location, &host_change);
if (do_connect_host(c, location) == zoom_complete)
return; /* connect failed.. */
+ cs_rcvconnect(c->cs);
send_HTTP_redirect(c, location);
return;
}
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)