projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 4.2.46
[yaz-moved-to-github.git]
/
src
/
zoom-c.c
diff --git
a/src/zoom-c.c
b/src/zoom-c.c
index
0bb0b3f
..
2445215
100644
(file)
--- a/
src/zoom-c.c
+++ b/
src/zoom-c.c
@@
-89,7
+89,7
@@
void ZOOM_set_dset_error(ZOOM_connection c, int error,
int ZOOM_uri_to_code(const char *uri)
{
int ZOOM_uri_to_code(const char *uri)
{
- int code = 0;
+ int code = 0;
const char *cp;
if ((cp = strrchr(uri, '/')))
code = atoi(cp+1);
const char *cp;
if ((cp = strrchr(uri, '/')))
code = atoi(cp+1);
@@
-274,7
+274,7
@@
ZOOM_API(ZOOM_connection)
c->host_port = 0;
c->proxy = 0;
c->tproxy = 0;
c->host_port = 0;
c->proxy = 0;
c->tproxy = 0;
-
+
c->charset = c->lang = 0;
c->cookie_out = 0;
c->charset = c->lang = 0;
c->cookie_out = 0;
@@
-327,17
+327,10
@@
char **ZOOM_connection_get_databases(ZOOM_connection con, ZOOM_options options,
{
char **databaseNames;
const char *cp = ZOOM_options_get(options, "databaseName");
{
char **databaseNames;
const char *cp = ZOOM_options_get(options, "databaseName");
-
+
if ((!cp || !*cp) && con->host_port)
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++;
- }
- if (!cp)
+ cs_get_host_args(con->host_port, &cp);
+ if (!cp || !*cp)
cp = "Default";
nmem_strsplit(odr_getmem(odr), "+", cp, &databaseNames, num);
return databaseNames;
cp = "Default";
nmem_strsplit(odr_getmem(odr), "+", cp, &databaseNames, num);
return databaseNames;
@@
-419,7
+412,6
@@
ZOOM_API(void)
c->tproxy = xstrdup(val);
}
c->tproxy = xstrdup(val);
}
-
xfree(c->charset);
c->charset = 0;
val = ZOOM_options_get(c->options, "charset");
xfree(c->charset);
c->charset = 0;
val = ZOOM_options_get(c->options, "charset");
@@
-450,7
+442,7
@@
ZOOM_API(void)
}
else
c->host_port = xstrdup(host);
}
else
c->host_port = xstrdup(host);
- }
+ }
{
/*
{
/*
@@
-466,20
+458,22
@@
ZOOM_API(void)
char *pcomma;
char *pequals;
while ((pcomma = strchr(remainder, ',')) != 0 &&
char *pcomma;
char *pequals;
while ((pcomma = strchr(remainder, ',')) != 0 &&
- (pcolon == 0 || pcomma < pcolon)) {
+ (pcolon == 0 || pcomma < pcolon))
+ {
*pcomma = '\0';
*pcomma = '\0';
- if ((pequals = strchr(remainder, '=')) != 0) {
+ if ((pequals = strchr(remainder, '=')) != 0)
+ {
*pequals = '\0';
*pequals = '\0';
- /*printf("# setting '%s'='%s'\n", remainder, pequals+1);*/
ZOOM_connection_option_set(c, remainder, pequals+1);
}
remainder = pcomma+1;
}
ZOOM_connection_option_set(c, remainder, pequals+1);
}
remainder = pcomma+1;
}
- if (remainder != c->host_port) {
+ if (remainder != c->host_port)
+ {
+ remainder = xstrdup(remainder);
xfree(c->host_port);
xfree(c->host_port);
- c->host_port = xstrdup(remainder);
- /*printf("# reset hp='%s'\n", remainder);*/
+ c->host_port = remainder;
}
}
}
}
@@
-496,7
+490,7
@@
ZOOM_API(void)
c->cookie_out = 0;
val = ZOOM_options_get(c->options, "cookie");
if (val && *val)
c->cookie_out = 0;
val = ZOOM_options_get(c->options, "cookie");
if (val && *val)
- {
+ {
yaz_log(c->log_details, "%p ZOOM_connection_connect cookie=%s", c, val);
c->cookie_out = xstrdup(val);
}
yaz_log(c->log_details, "%p ZOOM_connection_connect cookie=%s", c, val);
c->cookie_out = xstrdup(val);
}
@@
-531,11
+525,11
@@
ZOOM_API(void)
if (val && *val)
c->password = xstrdup(val);
if (val && *val)
c->password = xstrdup(val);
-
+
c->maximum_record_size =
c->maximum_record_size =
- ZOOM_options_get_int(c->options, "maximumRecordSize", 1024*1024);
+ ZOOM_options_get_int(c->options, "maximumRecordSize", 64*1024*1024);
c->preferred_message_size =
c->preferred_message_size =
- ZOOM_options_get_int(c->options, "preferredMessageSize", 1024*1024);
+ ZOOM_options_get_int(c->options, "preferredMessageSize", 64*1024*1024);
c->async = ZOOM_options_get_bool(c->options, "async", 0);
c->async = ZOOM_options_get_bool(c->options, "async", 0);
@@
-737,7
+731,7
@@
ZOOM_API(ZOOM_resultset)
r->query = q;
r->options = ZOOM_options_create_with_parent(c->options);
r->query = q;
r->options = ZOOM_options_create_with_parent(c->options);
-
+
start = ZOOM_options_get_int(r->options, "start", 0);
count = ZOOM_options_get_int(r->options, "count", 0);
{
start = ZOOM_options_get_int(r->options, "start", 0);
count = ZOOM_options_get_int(r->options, "count", 0);
{
@@
-756,7
+750,7
@@
ZOOM_API(ZOOM_resultset)
r->databaseNames = ZOOM_connection_get_databases(c, c->options, &r->num_databaseNames,
r->odr);
r->databaseNames = ZOOM_connection_get_databases(c, c->options, &r->num_databaseNames,
r->odr);
-
+
r->connection = c;
#if ZOOM_RESULT_LISTS
r->connection = c;
#if ZOOM_RESULT_LISTS
@@
-790,12
+784,12
@@
ZOOM_API(ZOOM_resultset)
task->u.search.count = count;
task->u.search.recv_search_fired = 0;
task->u.search.count = count;
task->u.search.recv_search_fired = 0;
- syntax = ZOOM_options_get(r->options, "preferredRecordSyntax");
+ 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.syntax = syntax ? xstrdup(syntax) : 0;
elementSetName = ZOOM_options_get(r->options, "elementSetName");
- task->u.search.elementSetName = elementSetName
+ task->u.search.elementSetName = elementSetName
? xstrdup(elementSetName) : 0;
? xstrdup(elementSetName) : 0;
-
+
ZOOM_resultset_addref(r);
ZOOM_query_addref(q);
ZOOM_resultset_addref(r);
ZOOM_query_addref(q);
@@
-846,13
+840,13
@@
ZOOM_API(int)
c->reconnect_ok = 1;
}
}
c->reconnect_ok = 1;
}
}
-
+
ZOOM_resultset_cache_reset(r);
task = ZOOM_connection_add_task(c, ZOOM_TASK_SORT);
task->u.sort.resultset = r;
task->u.sort.q = newq;
ZOOM_resultset_cache_reset(r);
task = ZOOM_connection_add_task(c, ZOOM_TASK_SORT);
task->u.sort.resultset = r;
task->u.sort.q = newq;
- ZOOM_resultset_addref(r);
+ ZOOM_resultset_addref(r);
if (!c->async)
{
if (!c->async)
{
@@
-958,10
+952,10
@@
static void ZOOM_resultset_retrieve(ZOOM_resultset r,
task->u.retrieve.start = start;
task->u.retrieve.count = count;
task->u.retrieve.start = start;
task->u.retrieve.count = count;
- syntax = ZOOM_options_get(r->options, "preferredRecordSyntax");
+ syntax = ZOOM_options_get(r->options, "preferredRecordSyntax");
task->u.retrieve.syntax = syntax ? xstrdup(syntax) : 0;
elementSetName = ZOOM_options_get(r->options, "elementSetName");
task->u.retrieve.syntax = syntax ? xstrdup(syntax) : 0;
elementSetName = ZOOM_options_get(r->options, "elementSetName");
- task->u.retrieve.elementSetName = elementSetName
+ task->u.retrieve.elementSetName = elementSetName
? xstrdup(elementSetName) : 0;
cp = ZOOM_options_get(r->options, "schema");
? xstrdup(elementSetName) : 0;
cp = ZOOM_options_get(r->options, "schema");
@@
-1020,6
+1014,15
@@
ZOOM_API(ZOOM_facet_field)
return 0;
}
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];
+ }
+ return 0;
+}
ZOOM_API(ZOOM_facet_field *)
ZOOM_resultset_facets(ZOOM_resultset r)
ZOOM_API(ZOOM_facet_field *)
ZOOM_resultset_facets(ZOOM_resultset r)
@@
-1028,7
+1031,7
@@
ZOOM_API(ZOOM_facet_field *)
}
ZOOM_API(const char**)
}
ZOOM_API(const char**)
- ZOOM_resultset_facet_names(ZOOM_resultset r)
+ ZOOM_resultset_facets_names(ZOOM_resultset r)
{
return (const char **) r->facets_names;
}
{
return (const char **) r->facets_names;
}
@@
-1056,7
+1059,7
@@
static void get_cert(ZOOM_connection c)
{
char *cert_buf;
int cert_len;
{
char *cert_buf;
int cert_len;
-
+
if (cs_get_peer_certificate_x509(c->cs, &cert_buf, &cert_len))
{
ZOOM_connection_option_setl(c, "sslPeerCert",
if (cs_get_peer_certificate_x509(c->cs, &cert_buf, &cert_len))
{
ZOOM_connection_option_setl(c, "sslPeerCert",
@@
-1081,7
+1084,7
@@
static zoom_ret do_connect_host(ZOOM_connection c, const char *logical_url)
cs_close(c->cs);
c->cs = cs_create_host_proxy(logical_url, 0, &add,
c->tproxy ? c->tproxy : c->proxy);
cs_close(c->cs);
c->cs = cs_create_host_proxy(logical_url, 0, &add,
c->tproxy ? c->tproxy : c->proxy);
-
+
if (c->cs && c->cs->protocol == PROTO_HTTP)
{
#if YAZ_HAVE_XML2
if (c->cs && c->cs->protocol == PROTO_HTTP)
{
#if YAZ_HAVE_XML2
@@
-1121,7
+1124,7
@@
static zoom_ret do_connect_host(ZOOM_connection c, const char *logical_url)
if (c->cs->io_pending & CS_WANT_READ)
mask += ZOOM_SELECT_READ;
ZOOM_connection_set_mask(c, mask);
if (c->cs->io_pending & CS_WANT_READ)
mask += ZOOM_SELECT_READ;
ZOOM_connection_set_mask(c, mask);
- c->state = STATE_CONNECTING;
+ c->state = STATE_CONNECTING;
return zoom_pending;
}
}
return zoom_pending;
}
}
@@
-1131,14
+1134,14
@@
static zoom_ret do_connect_host(ZOOM_connection c, const char *logical_url)
}
/* returns 1 if PDU was sent OK (still pending )
}
/* returns 1 if PDU was sent OK (still pending )
- 0 if PDU was not sent OK (nothing to wait for)
+ 0 if PDU was not sent OK (nothing to wait for)
*/
ZOOM_API(ZOOM_record)
ZOOM_resultset_record_immediate(ZOOM_resultset s,size_t pos)
{
const char *syntax =
*/
ZOOM_API(ZOOM_record)
ZOOM_resultset_record_immediate(ZOOM_resultset s,size_t pos)
{
const char *syntax =
- ZOOM_options_get(s->options, "preferredRecordSyntax");
+ ZOOM_options_get(s->options, "preferredRecordSyntax");
const char *elementSetName =
ZOOM_options_get(s->options, "elementSetName");
const char *elementSetName =
ZOOM_options_get(s->options, "elementSetName");
@@
-1206,7
+1209,7
@@
ZOOM_API(ZOOM_scanset)
{
ZOOM_task task = ZOOM_connection_add_task(c, ZOOM_TASK_SCAN);
task->u.scan.scan = scan;
{
ZOOM_task task = ZOOM_connection_add_task(c, ZOOM_TASK_SCAN);
task->u.scan.scan = scan;
-
+
(scan->refcount)++;
if (!c->async)
{
(scan->refcount)++;
if (!c->async)
{
@@
-1228,7
+1231,7
@@
ZOOM_API(void)
ZOOM_query_destroy(scan->query);
odr_destroy(scan->odr);
ZOOM_query_destroy(scan->query);
odr_destroy(scan->odr);
-
+
ZOOM_options_destroy(scan->options);
xfree(scan);
}
ZOOM_options_destroy(scan->options);
xfree(scan);
}
@@
-1242,10
+1245,10
@@
static zoom_ret send_package(ZOOM_connection c)
if (!c->tasks)
return zoom_complete;
assert (c->tasks->which == ZOOM_TASK_PACKAGE);
if (!c->tasks)
return zoom_complete;
assert (c->tasks->which == ZOOM_TASK_PACKAGE);
-
+
event = ZOOM_Event_create(ZOOM_EVENT_SEND_APDU);
ZOOM_connection_put_event(c, event);
event = ZOOM_Event_create(ZOOM_EVENT_SEND_APDU);
ZOOM_connection_put_event(c, event);
-
+
c->buf_out = c->tasks->u.package->buf_out;
c->len_out = c->tasks->u.package->len_out;
c->buf_out = c->tasks->u.package->buf_out;
c->len_out = c->tasks->u.package->len_out;
@@
-1271,7
+1274,7
@@
static void ZOOM_scanset_term_x(ZOOM_scanset scan, size_t pos,
const char **disp_term, size_t *disp_len)
{
size_t noent = ZOOM_scanset_size(scan);
const char **disp_term, size_t *disp_len)
{
size_t noent = ZOOM_scanset_size(scan);
-
+
*value_term = 0;
*value_len = 0;
*value_term = 0;
*value_len = 0;
@@
-1287,7
+1290,7
@@
static void ZOOM_scanset_term_x(ZOOM_scanset scan, size_t pos,
if (res->entries->entries[pos]->which == Z_Entry_termInfo)
{
Z_TermInfo *t = res->entries->entries[pos]->u.termInfo;
if (res->entries->entries[pos]->which == Z_Entry_termInfo)
{
Z_TermInfo *t = res->entries->entries[pos]->u.termInfo;
-
+
*value_term = (const char *) t->term->u.general->buf;
*value_len = t->term->u.general->len;
if (t->displayTerm)
*value_term = (const char *) t->term->u.general->buf;
*value_len = t->term->u.general->len;
if (t->displayTerm)
@@
-1333,7
+1336,7
@@
ZOOM_API(const char *)
ZOOM_scanset_term_x(scan, pos, occ, &value_term, &value_len,
&disp_term, &disp_len);
ZOOM_scanset_term_x(scan, pos, occ, &value_term, &value_len,
&disp_term, &disp_len);
-
+
*len = value_len;
return value_term;
}
*len = value_len;
return value_term;
}
@@
-1349,7
+1352,7
@@
ZOOM_API(const char *)
ZOOM_scanset_term_x(scan, pos, occ, &value_term, &value_len,
&disp_term, &disp_len);
ZOOM_scanset_term_x(scan, pos, occ, &value_term, &value_len,
&disp_term, &disp_len);
-
+
*len = disp_len;
return disp_term;
}
*len = disp_len;
return disp_term;
}
@@
-1392,7
+1395,7
@@
ZOOM_API(void)
{
odr_destroy(p->odr_out);
xfree(p->buf_out);
{
odr_destroy(p->odr_out);
xfree(p->buf_out);
-
+
ZOOM_options_destroy(p->options);
xfree(p);
}
ZOOM_options_destroy(p->options);
xfree(p);
}
@@
-1478,7
+1481,7
@@
ZOOM_API(int)
ret = send_package(c);
break;
case ZOOM_TASK_SORT:
ret = send_package(c);
break;
case ZOOM_TASK_SORT:
- c->tasks->u.sort.resultset->r_sort_spec =
+ c->tasks->u.sort.resultset->r_sort_spec =
ZOOM_query_get_sortspec(c->tasks->u.sort.q);
ret = send_Z3950_sort(c, c->tasks->u.sort.resultset);
break;
ZOOM_query_get_sortspec(c->tasks->u.sort.q);
ret = send_Z3950_sort(c, c->tasks->u.sort.resultset);
break;
@@
-1599,8
+1602,8
@@
static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres)
return;
}
}
return;
}
}
- else
- {
+ else
+ {
ret = ZOOM_handle_sru(c, hres, &cret, &addinfo);
if (ret == 0)
{
ret = ZOOM_handle_sru(c, hres, &cret, &addinfo);
if (ret == 0)
{
@@
-1660,10
+1663,10
@@
static int do_read(ZOOM_connection c)
{
int r, more;
ZOOM_Event event;
{
int r, more;
ZOOM_Event event;
-
+
event = ZOOM_Event_create(ZOOM_EVENT_RECV_DATA);
ZOOM_connection_put_event(c, event);
event = ZOOM_Event_create(ZOOM_EVENT_RECV_DATA);
ZOOM_connection_put_event(c, event);
-
+
r = cs_get(c->cs, &c->buf_in, &c->len_in);
more = cs_more(c->cs);
yaz_log(c->log_details, "%p do_read len=%d more=%d", c, r, more);
r = cs_get(c->cs, &c->buf_in, &c->len_in);
more = cs_more(c->cs);
yaz_log(c->log_details, "%p do_read len=%d more=%d", c, r, more);
@@
-1732,7
+1735,7
@@
static zoom_ret do_write_ex(ZOOM_connection c, char *buf_out, int len_out)
{
int r;
ZOOM_Event event;
{
int r;
ZOOM_Event event;
-
+
event = ZOOM_Event_create(ZOOM_EVENT_SEND_DATA);
ZOOM_connection_put_event(c, event);
event = ZOOM_Event_create(ZOOM_EVENT_SEND_DATA);
ZOOM_connection_put_event(c, event);
@@
-1752,7
+1755,7
@@
static zoom_ret do_write_ex(ZOOM_connection c, char *buf_out, int len_out)
return zoom_complete;
}
else if (r == 1)
return zoom_complete;
}
else if (r == 1)
- {
+ {
int mask = ZOOM_SELECT_EXCEPT;
if (c->cs->io_pending & CS_WANT_WRITE)
mask += ZOOM_SELECT_WRITE;
int mask = ZOOM_SELECT_EXCEPT;
if (c->cs->io_pending & CS_WANT_WRITE)
mask += ZOOM_SELECT_WRITE;
@@
-1933,7
+1936,7
@@
static void ZOOM_connection_do_io(ZOOM_connection c, int mask)
int r = cs_look(c->cs);
yaz_log(c->log_details, "%p ZOOM_connection_do_io mask=%d cs_look=%d",
c, mask, r);
int r = cs_look(c->cs);
yaz_log(c->log_details, "%p ZOOM_connection_do_io mask=%d cs_look=%d",
c, mask, r);
-
+
if (r == CS_NONE)
{
event = ZOOM_Event_create(ZOOM_EVENT_CONNECT);
if (r == CS_NONE)
{
event = ZOOM_Event_create(ZOOM_EVENT_CONNECT);
@@
-2049,7
+2052,7
@@
ZOOM_API(int)
int i;
yaz_log(log_details0, "ZOOM_process_event(no=%d,cs=%p)", no, cs);
int i;
yaz_log(log_details0, "ZOOM_process_event(no=%d,cs=%p)", no, cs);
-
+
for (i = 0; i<no; i++)
{
ZOOM_connection c = cs[i];
for (i = 0; i<no; i++)
{
ZOOM_connection c = cs[i];
@@
-2078,7
+2081,7
@@
ZOOM_API(int) ZOOM_connection_set_mask(ZOOM_connection c, int mask)
{
c->mask = mask;
if (!c->cs)
{
c->mask = mask;
if (!c->cs)
- return -1;
+ return -1;
return 0;
}
return 0;
}