* Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: zoom-c.c,v 1.87 2006-08-25 14:57:04 adam Exp $
+ * $Id: zoom-c.c,v 1.94 2006-10-31 14:08:03 adam Exp $
*/
/**
* \file zoom-c.c
#include <sys/select.h>
#endif
#ifdef WIN32
+#if FD_SETSIZE < 512
+#define FD_SETSIZE 512
+#endif
#include <winsock.h>
#endif
static zoom_ret do_write_ex(ZOOM_connection c, char *buf_out, int len_out);
static char *cql2pqf(ZOOM_connection c, const char *cql);
-static void initlog()
+static void initlog(void)
{
static int log_level_initialized = 0;
if (!log_level_initialized)
return *taskp;
}
+ZOOM_API(int) ZOOM_connection_is_idle(ZOOM_connection c)
+{
+ return c->tasks ? 0 : 1;
+}
+
ZOOM_task ZOOM_connection_insert_task(ZOOM_connection c, int which)
{
ZOOM_task task = (ZOOM_task) xmalloc(sizeof(*task));
{
case ZOOM_TASK_SEARCH:
ZOOM_resultset_destroy(task->u.search.resultset);
+ xfree(task->u.search.syntax);
+ xfree(task->u.search.elementSetName);
break;
case ZOOM_TASK_RETRIEVE:
ZOOM_resultset_destroy(task->u.retrieve.resultset);
+ xfree(task->u.retrieve.syntax);
+ xfree(task->u.retrieve.elementSetName);
break;
case ZOOM_TASK_CONNECT:
break;
ZOOM_connection_remove_task(c);
}
-static ZOOM_record record_cache_lookup(ZOOM_resultset r, int pos);
+static ZOOM_record record_cache_lookup(ZOOM_resultset r, int pos,
+ const char *syntax,
+ const char *elementSetName);
ZOOM_API(ZOOM_connection)
ZOOM_connection_create(ZOOM_options options)
return c;
}
+
/* set database names. Take local databases (if set); otherwise
take databases given in ZURL (if set); otherwise use Default */
static char **set_DatabaseNames(ZOOM_connection con, ZOOM_options options,
}
}
-ZOOM_resultset ZOOM_resultset_create()
+ZOOM_resultset ZOOM_resultset_create(void)
{
int i;
ZOOM_resultset r = (ZOOM_resultset) xmalloc(sizeof(*r));
ZOOM_task task;
const char *cp;
int start, count;
+ const char *syntax, *elementSetName;
yaz_log(log_api, "%p ZOOM_connection_search set %p query %p", c, r, q);
r->r_sort_spec = q->sort_spec;
task->u.search.resultset = r;
task->u.search.start = start;
task->u.search.count = count;
- ZOOM_resultset_addref(r);
+
+ 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;
+
+ ZOOM_resultset_addref(r);
(q->refcount)++;
c->state = STATE_IDLE;
}
+static int ZOOM_test_reconnect(ZOOM_connection c)
+{
+ if (!c->reconnect_ok)
+ return 0;
+ do_close(c);
+ c->reconnect_ok = 0;
+ c->tasks->running = 0;
+ ZOOM_connection_insert_task(c, ZOOM_TASK_CONNECT);
+ return 1;
+}
+
static void ZOOM_resultset_retrieve(ZOOM_resultset r,
int force_sync, int start, int count)
{
ZOOM_task task;
ZOOM_connection c;
const char *cp;
+ const char *syntax, *elementSetName;
if (!r)
return;
task->u.retrieve.start = start;
task->u.retrieve.count = count;
+ 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.elementSetName = elementSetName
+ ? xstrdup(elementSetName) : 0;
+
cp = ZOOM_options_get(r->options, "schema");
if (cp)
{
odr_prepend(c->odr_out, "ZOOM-C",
ireq->implementationName));
- version = odr_strdup(c->odr_out, "$Revision: 1.87 $");
+ version = odr_strdup(c->odr_out, "$Revision: 1.94 $");
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
ireq->implementationVersion =
if (c->error) /* don't continue on error */
return zoom_complete;
assert(c->tasks);
- if (c->tasks->which == ZOOM_TASK_SEARCH)
+ switch(c->tasks->which)
{
+ case ZOOM_TASK_SEARCH:
resultset = c->tasks->u.search.resultset;
resultset->setname = xstrdup("default");
ZOOM_options_set(resultset->options, "setname", resultset->setname);
start = &c->tasks->u.search.start;
count = &c->tasks->u.search.count;
- }
- else if (c->tasks->which == ZOOM_TASK_RETRIEVE)
- {
+ break;
+ case ZOOM_TASK_RETRIEVE:
resultset = c->tasks->u.retrieve.resultset;
start = &c->tasks->u.retrieve.start;
for (i = 0; i < *count; i++)
{
ZOOM_record rec =
- record_cache_lookup(resultset, i + *start);
+ record_cache_lookup(resultset, i + *start,
+ c->tasks->u.retrieve.syntax,
+ c->tasks->u.retrieve.elementSetName);
if (!rec)
break;
else
if (*count == 0)
return zoom_complete;
+ break;
+ default:
+ return zoom_complete;
}
assert(resultset->query);
set_DatabaseNames(c, r->options, &search_req->num_databaseNames);
/* get syntax (no need to provide unless piggyback is in effect) */
- syntax = ZOOM_options_get(r->options, "preferredRecordSyntax");
+ syntax = c->tasks->u.search.syntax;
lslb = ZOOM_options_get_int(r->options, "largeSetLowerBound", -1);
ssub = ZOOM_options_get_int(r->options, "smallSetUpperBound", -1);
ZOOM_API(ZOOM_record)
ZOOM_resultset_record_immediate(ZOOM_resultset s,size_t pos)
{
- return record_cache_lookup(s, pos);
+ const char *syntax =
+ ZOOM_options_get(s->options, "preferredRecordSyntax");
+ const char *elementSetName =
+ ZOOM_options_get(s->options, "elementSetName");
+
+ return record_cache_lookup(s, pos, syntax, elementSetName);
}
ZOOM_API(ZOOM_record)
return buf;
}
+ZOOM_API(int)
+ ZOOM_record_error(ZOOM_record rec, const char **cp,
+ const char **addinfo, const char **diagset)
+{
+ Z_NamePlusRecord *npr;
+
+ if (!rec)
+ return 0;
+ npr = rec->npr;
+ if (npr && npr->which == Z_NamePlusRecord_surrogateDiagnostic)
+ {
+ Z_DiagRec *diag_rec = npr->u.surrogateDiagnostic;
+ int error = YAZ_BIB1_UNSPECIFIED_ERROR;
+ const char *add = 0;
+
+ if (diag_rec->which == Z_DiagRec_defaultFormat)
+ {
+ Z_DefaultDiagFormat *ddf = diag_rec->u.defaultFormat;
+ int oclass;
+
+ error = *ddf->condition;
+ switch (ddf->which)
+ {
+ case Z_DefaultDiagFormat_v2Addinfo:
+ add = ddf->u.v2Addinfo;
+ break;
+ case Z_DefaultDiagFormat_v3Addinfo:
+ add = ddf->u.v3Addinfo;
+ break;
+ }
+ if (diagset)
+ *diagset = yaz_z3950oid_to_str(ddf->diagnosticSetId, &oclass);
+ }
+ else
+ {
+ if (diagset)
+ *diagset = "Bib-1";
+ }
+ if (addinfo)
+ *addinfo = add ? add : "";
+ if (cp)
+ *cp = diagbib1_str(error);
+ return error;
+ }
+ return 0;
+}
+
ZOOM_API(const char *)
ZOOM_record_get(ZOOM_record rec, const char *type_spec, int *len)
{
}
static void record_cache_add(ZOOM_resultset r, Z_NamePlusRecord *npr,
- int pos)
+ int pos,
+ const char *syntax, const char *elementSetName)
{
ZOOM_record_cache rc;
- const char *elementSetName =
- ZOOM_resultset_option_get(r, "elementSetName");
- const char *syntax =
- ZOOM_resultset_option_get(r, "preferredRecordSyntax");
ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_RECV_RECORD);
ZOOM_connection_put_event(r->connection, event);
r->record_hash[record_hash(pos)] = rc;
}
-static ZOOM_record record_cache_lookup(ZOOM_resultset r, int pos)
+static ZOOM_record record_cache_lookup(ZOOM_resultset r, int pos,
+ const char *syntax,
+ const char *elementSetName)
{
ZOOM_record_cache rc;
- const char *elementSetName =
- ZOOM_resultset_option_get(r, "elementSetName");
- const char *syntax =
- ZOOM_resultset_option_get(r, "preferredRecordSyntax");
for (rc = r->record_hash[record_hash(pos)]; rc; rc = rc->next)
{
{
ZOOM_resultset resultset;
int *start, *count;
+ const char *syntax = 0, *elementSetName = 0;
if (!c->tasks)
return ;
resultset = c->tasks->u.search.resultset;
start = &c->tasks->u.search.start;
count = &c->tasks->u.search.count;
+ syntax = c->tasks->u.search.syntax;
+ elementSetName = c->tasks->u.search.elementSetName;
break;
case ZOOM_TASK_RETRIEVE:
resultset = c->tasks->u.retrieve.resultset;
start = &c->tasks->u.retrieve.start;
count = &c->tasks->u.retrieve.count;
+ syntax = c->tasks->u.retrieve.syntax;
+ elementSetName = c->tasks->u.retrieve.elementSetName;
break;
default:
return;
sr->u.databaseOrSurDiagnostics;
for (i = 0; i<p->num_records; i++)
{
- record_cache_add(resultset, p->records[i], i + *start);
+ record_cache_add(resultset, p->records[i], i + *start,
+ syntax, elementSetName);
}
*count -= i;
*start += i;
/* present response and we didn't get any records! */
Z_NamePlusRecord *myrec =
zget_surrogateDiagRec(resultset->odr, 0, 14, 0);
- record_cache_add(resultset, myrec, *start);
+ record_cache_add(resultset, myrec, *start,
+ syntax, elementSetName);
}
}
else if (present_phase)
/* present response and we didn't get any records! */
Z_NamePlusRecord *myrec =
zget_surrogateDiagRec(resultset->odr, 0, 14, 0);
- record_cache_add(resultset, myrec, *start);
+ record_cache_add(resultset, myrec, *start, syntax, elementSetName);
}
}
}
resultset = c->tasks->u.search.resultset;
start = &c->tasks->u.search.start;
count = &c->tasks->u.search.count;
+ syntax = c->tasks->u.search.syntax;
+ elementSetName = c->tasks->u.search.elementSetName;
break;
case ZOOM_TASK_RETRIEVE:
resultset = c->tasks->u.retrieve.resultset;
start = &c->tasks->u.retrieve.start;
count = &c->tasks->u.retrieve.count;
+ syntax = c->tasks->u.retrieve.syntax;
+ elementSetName = c->tasks->u.retrieve.elementSetName;
if (*start >= resultset->size)
{
yaz_log(log_details, "%p send_present start=%d count=%d",
c, *start, *count);
- syntax = ZOOM_resultset_option_get(resultset, "preferredRecordSyntax");
- elementSetName = ZOOM_resultset_option_get(resultset, "elementSetName");
-
if (c->error) /* don't continue on error */
return zoom_complete;
if (*start < 0)
for (i = 0; i < *count; i++)
{
ZOOM_record rec =
- record_cache_lookup(resultset, i + *start);
+ record_cache_lookup(resultset, i + *start, syntax, elementSetName);
if (!rec)
break;
else
break;
case Z_APDU_close:
yaz_log(log_api, "%p recv_apdu Close PDU", c);
- if (c->reconnect_ok)
- {
- do_close(c);
- c->reconnect_ok = 0;
- c->tasks->running = 0;
- ZOOM_connection_insert_task(c, ZOOM_TASK_CONNECT);
- }
- else
+ if (!ZOOM_test_reconnect(c))
{
set_ZOOM_error(c, ZOOM_ERROR_CONNECTION_LOST, c->host_port);
do_close(c);
NMEM nmem;
ZOOM_Event event;
int *start;
+ const char *syntax, *elementSetName;
if (!c->tasks)
return;
- if (c->tasks->which == ZOOM_TASK_SEARCH)
+ switch(c->tasks->which)
{
+ case ZOOM_TASK_SEARCH:
resultset = c->tasks->u.search.resultset;
start = &c->tasks->u.search.start;
- }
- else if (c->tasks->which == ZOOM_TASK_RETRIEVE)
- {
+ syntax = c->tasks->u.search.syntax;
+ elementSetName = c->tasks->u.search.elementSetName;
+ break;
+ case ZOOM_TASK_RETRIEVE:
resultset = c->tasks->u.retrieve.resultset;
start = &c->tasks->u.retrieve.start;
+ syntax = c->tasks->u.retrieve.syntax;
+ elementSetName = c->tasks->u.retrieve.elementSetName;
+ break;
+ default:
+ return;
}
- else
- return ;
-
event = ZOOM_Event_create(ZOOM_EVENT_RECV_SEARCH);
ZOOM_connection_put_event(c, event);
npr->u.databaseRecord->u.octet_aligned->len =
npr->u.databaseRecord->u.octet_aligned->size =
res->records[i].recordData_len;
- record_cache_add(resultset, npr, pos);
+ record_cache_add(resultset, npr, pos, syntax, elementSetName);
}
if (res->num_diagnostics > 0)
{
return 0;
if (r <= 0)
{
- if (c->reconnect_ok)
+ if (ZOOM_test_reconnect(c))
{
yaz_log(log_details, "%p do_read reconnect read", c);
- do_close(c);
- c->reconnect_ok = 0;
- c->tasks->running = 0;
- ZOOM_connection_insert_task(c, ZOOM_TASK_CONNECT);
}
else
{
if ((r = cs_put(c->cs, buf_out, len_out)) < 0)
{
yaz_log(log_details, "%p do_write_ex write failed", c);
- if (c->reconnect_ok)
+ if (ZOOM_test_reconnect(c))
{
- do_close(c);
- c->reconnect_ok = 0;
- c->tasks->running = 0;
- ZOOM_connection_insert_task(c, ZOOM_TASK_CONNECT);
return zoom_pending;
}
if (c->state == STATE_CONNECTING)
yaz_log(log_details, "%p ZOOM_connection_do_io mask=%d cs_look=%d",
c, mask, r);
- if (mask & ZOOM_SELECT_EXCEPT)
- {
- if (r == CS_CONNECT)
- set_ZOOM_error(c, ZOOM_ERROR_CONNECT, c->host_port);
- else
- set_ZOOM_error(c, ZOOM_ERROR_CONNECTION_LOST, c->host_port);
- do_close(c);
- return;
- }
if (r == CS_NONE)
{
event = ZOOM_Event_create(ZOOM_EVENT_CONNECT);
}
else
{
+ if (mask & ZOOM_SELECT_EXCEPT)
+ {
+ if (ZOOM_test_reconnect(c))
+ {
+ event = ZOOM_Event_create(ZOOM_EVENT_CONNECT);
+ ZOOM_connection_put_event(c, event);
+ }
+ else
+ {
+ set_ZOOM_error(c, ZOOM_ERROR_CONNECTION_LOST, c->host_port);
+ do_close(c);
+ }
+ return;
+ }
if (mask & ZOOM_SELECT_READ)
do_read(c);
if (c->cs && (mask & ZOOM_SELECT_WRITE))
projects / yaz-moved-to-github.git / blobdiff