X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zoom%2Fzoom-c.c;h=ddca6410dbaa214ec7a5f209a60674718ae04d3e;hb=d83cfde85ccff3bfb2d45515516c9c15bc785ebb;hp=8b38ce38ceb3fa09fb2fbaae0ea67779c240420b;hpb=67e7a7a13ff1e787b9e5cfe84494dfd446c1bcb9;p=yaz-moved-to-github.git diff --git a/zoom/zoom-c.c b/zoom/zoom-c.c index 8b38ce3..ddca641 100644 --- a/zoom/zoom-c.c +++ b/zoom/zoom-c.c @@ -1,5 +1,5 @@ /* - * $Id: zoom-c.c,v 1.3 2001-11-06 17:05:19 adam Exp $ + * $Id: zoom-c.c,v 1.21 2002-01-21 21:50:32 adam Exp $ * * ZOOM layer for C, connections, result sets, queries. */ @@ -12,26 +12,136 @@ #include "zoom-p.h" -static Z3950_record record_cache_lookup (Z3950_resultset r, - int pos, - const char *elementSetName); +#if HAVE_SYS_POLL_H +#include +#endif -static void clear_error (Z3950_connection c) +static ZOOM_Event ZOOM_Event_create (int kind) { - c->error = Z3950_ERROR_NONE; - xfree (c->addinfo); - c->addinfo = 0; + ZOOM_Event event = xmalloc (sizeof(*event)); + event->kind = kind; + event->next = 0; + event->prev = 0; + return event; +} + +static void ZOOM_Event_destroy (ZOOM_Event event) +{ + xfree (event); +} + +static void ZOOM_connection_put_event (ZOOM_connection c, ZOOM_Event event) +{ + if (c->m_queue_back) + { + c->m_queue_back->prev = event; + assert (c->m_queue_front); + } + else + { + assert (!c->m_queue_front); + c->m_queue_front = event; + } + event->next = c->m_queue_back; + event->prev = 0; + c->m_queue_back = event; +} + +static ZOOM_Event ZOOM_connection_get_event(ZOOM_connection c) +{ + ZOOM_Event event = c->m_queue_front; + if (!event) + return 0; + assert (c->m_queue_back); + c->m_queue_front = event->prev; + if (c->m_queue_front) + { + assert (c->m_queue_back); + c->m_queue_front->next = 0; + } + else + c->m_queue_back = 0; + c->last_event = event->kind; + return event; +} + +static void clear_error (ZOOM_connection c) +{ + + switch (c->error) + { + case ZOOM_ERROR_CONNECT: + case ZOOM_ERROR_MEMORY: + case ZOOM_ERROR_DECODE: + case ZOOM_ERROR_CONNECTION_LOST: + case ZOOM_ERROR_INIT: + case ZOOM_ERROR_INTERNAL: + break; + default: + c->error = ZOOM_ERROR_NONE; + xfree (c->addinfo); + c->addinfo = 0; + } +} + +ZOOM_task ZOOM_connection_add_task (ZOOM_connection c, int which) +{ + ZOOM_task *taskp = &c->tasks; + while (*taskp) + taskp = &(*taskp)->next; + *taskp = xmalloc (sizeof(**taskp)); + (*taskp)->running = 0; + (*taskp)->which = which; + (*taskp)->next = 0; + clear_error (c); + return *taskp; } -Z3950_connection Z3950_connection_create (Z3950_options options) +void ZOOM_connection_remove_task (ZOOM_connection c) { - Z3950_connection c = xmalloc (sizeof(*c)); + ZOOM_task task = c->tasks; + + if (task) + { + c->tasks = task->next; + switch (task->which) + { + case ZOOM_TASK_SEARCH: + ZOOM_resultset_destroy (task->u.search.resultset); + break; + case ZOOM_TASK_RETRIEVE: + ZOOM_resultset_destroy (task->u.retrieve.resultset); + break; + case ZOOM_TASK_CONNECT: + break; + case ZOOM_TASK_SCAN: + ZOOM_scanset_destroy (task->u.scan.scan); + break; + default: + assert (0); + } + xfree (task); + } +} + +void ZOOM_connection_remove_tasks (ZOOM_connection c) +{ + while (c->tasks) + ZOOM_connection_remove_task(c); +} + +static ZOOM_record record_cache_lookup (ZOOM_resultset r, + int pos, + const char *elementSetName); + +ZOOM_connection ZOOM_connection_create (ZOOM_options options) +{ + ZOOM_connection c = xmalloc (sizeof(*c)); - c->event_pending = 0; c->cs = 0; c->mask = 0; c->state = STATE_IDLE; - c->error = Z3950_ERROR_NONE; + c->error = ZOOM_ERROR_NONE; c->addinfo = 0; c->buf_in = 0; c->len_in = 0; @@ -39,7 +149,7 @@ Z3950_connection Z3950_connection_create (Z3950_options options) c->len_out = 0; c->resultsets = 0; - c->options = Z3950_options_create_with_parent(options); + c->options = ZOOM_options_create_with_parent(options); c->host_port = 0; c->proxy = 0; @@ -52,17 +162,23 @@ Z3950_connection Z3950_connection_create (Z3950_options options) c->odr_out = odr_createmem (ODR_ENCODE); c->async = 0; + c->support_named_resultsets = 0; + c->last_event = ZOOM_EVENT_NONE; + + c->m_queue_front = 0; + c->m_queue_back = 0; 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 (Z3950_connection con, int *num) +static char **set_DatabaseNames (ZOOM_connection con, ZOOM_options options, + int *num) { char **databaseNames; const char *c; int no = 2; - const char *cp = Z3950_options_get (con->options, "databaseName"); + const char *cp = ZOOM_options_get (options, "databaseName"); if (!cp || !*cp) { @@ -107,20 +223,21 @@ static char **set_DatabaseNames (Z3950_connection con, int *num) return databaseNames; } -Z3950_connection Z3950_connection_new (const char *host, int portnum) +ZOOM_connection ZOOM_connection_new (const char *host, int portnum) { - Z3950_connection c = Z3950_connection_create (0); + ZOOM_connection c = ZOOM_connection_create (0); - Z3950_connection_connect (c, host, portnum); + ZOOM_connection_connect (c, host, portnum); return c; } -void Z3950_connection_connect(Z3950_connection c, +void ZOOM_connection_connect(ZOOM_connection c, const char *host, int portnum) { const char *val; + ZOOM_task task; - val = Z3950_options_get (c->options, "proxy"); + val = ZOOM_options_get (c->options, "proxy"); if (val && *val) c->proxy = xstrdup (val); else @@ -135,18 +252,24 @@ void Z3950_connection_connect(Z3950_connection c, else c->host_port = xstrdup(host); - c->async = Z3950_options_get_bool (c->options, "async", 0); - + ZOOM_options_set(c->options, "host", c->host_port); + + c->async = ZOOM_options_get_bool (c->options, "async", 0); + + c->error = ZOOM_ERROR_NONE; + + task = ZOOM_connection_add_task (c, ZOOM_TASK_CONNECT); + if (!c->async) { - while (Z3950_event (1, &c)) + while (ZOOM_event (1, &c)) ; } } -Z3950_query Z3950_query_create(void) +ZOOM_query ZOOM_query_create(void) { - Z3950_query s = xmalloc (sizeof(*s)); + ZOOM_query s = xmalloc (sizeof(*s)); s->refcount = 1; s->query = 0; @@ -156,18 +279,13 @@ Z3950_query Z3950_query_create(void) return s; } -const char *Z3950_connection_host (Z3950_connection c) -{ - return c->host_port; -} - -void Z3950_query_destroy(Z3950_query s) +void ZOOM_query_destroy(ZOOM_query s) { if (!s) return; (s->refcount)--; - yaz_log (LOG_DEBUG, "Z3950_query_destroy count=%d", s->refcount); + yaz_log (LOG_DEBUG, "ZOOM_query_destroy count=%d", s->refcount); if (s->refcount == 0) { odr_destroy (s->odr); @@ -175,7 +293,7 @@ void Z3950_query_destroy(Z3950_query s) } } -int Z3950_query_prefix(Z3950_query s, const char *str) +int ZOOM_query_prefix(ZOOM_query s, const char *str) { s->query = odr_malloc (s->odr, sizeof(*s->query)); s->query->which = Z_Query_type_1; @@ -185,7 +303,7 @@ int Z3950_query_prefix(Z3950_query s, const char *str) return 0; } -int Z3950_query_sortby(Z3950_query s, const char *criteria) +int ZOOM_query_sortby(ZOOM_query s, const char *criteria) { s->sort_spec = yaz_sort_spec (s->odr, criteria); if (!s->sort_spec) @@ -193,54 +311,11 @@ int Z3950_query_sortby(Z3950_query s, const char *criteria) return 0; } -static int do_write(Z3950_connection c); - - -Z3950_task Z3950_connection_add_task (Z3950_connection c, int which) -{ - Z3950_task *taskp = &c->tasks; - while (*taskp) - taskp = &(*taskp)->next; - *taskp = xmalloc (sizeof(**taskp)); - (*taskp)->running = 0; - (*taskp)->which = which; - (*taskp)->u.resultset = 0; /* one null pointer there at least */ - (*taskp)->next = 0; - clear_error (c); - return *taskp; -} - -void Z3950_connection_remove_task (Z3950_connection c) -{ - Z3950_task task = c->tasks; - - if (task) - { - c->tasks = task->next; - switch (task->which) - { - case Z3950_TASK_SEARCH: - Z3950_resultset_destroy (task->u.resultset); - break; - case Z3950_TASK_RETRIEVE: - Z3950_resultset_destroy (task->u.resultset); - break; - default: - assert (0); - } - xfree (task); - } -} +static int do_write(ZOOM_connection c); -void Z3950_connection_remove_tasks (Z3950_connection c) +void ZOOM_connection_destroy(ZOOM_connection c) { - while (c->tasks) - Z3950_connection_remove_task(c); -} - -void Z3950_connection_destroy(Z3950_connection c) -{ - Z3950_resultset r; + ZOOM_resultset r; if (!c) return; if (c->cs) @@ -252,26 +327,27 @@ void Z3950_connection_destroy(Z3950_connection c) xfree (c->addinfo); odr_destroy (c->odr_in); odr_destroy (c->odr_out); - Z3950_options_destroy (c->options); - Z3950_connection_remove_tasks (c); + ZOOM_options_destroy (c->options); + ZOOM_connection_remove_tasks (c); xfree (c->host_port); xfree (c); } -void Z3950_resultset_addref (Z3950_resultset r) +void ZOOM_resultset_addref (ZOOM_resultset r) { if (r) (r->refcount)++; } -Z3950_resultset Z3950_resultset_create () +ZOOM_resultset ZOOM_resultset_create () { - Z3950_resultset r = xmalloc (sizeof(*r)); + ZOOM_resultset r = xmalloc (sizeof(*r)); r->refcount = 1; r->size = 0; r->odr = odr_createmem (ODR_ENCODE); r->start = 0; r->piggyback = 1; + r->setname = 0; r->count = 0; r->record_cache = 0; r->r_sort_spec = 0; @@ -282,52 +358,57 @@ Z3950_resultset Z3950_resultset_create () return r; } -Z3950_resultset Z3950_connection_search_pqf(Z3950_connection c, const char *q) +ZOOM_resultset ZOOM_connection_search_pqf(ZOOM_connection c, const char *q) { - Z3950_resultset r; - Z3950_query s = Z3950_query_create(); + ZOOM_resultset r; + ZOOM_query s = ZOOM_query_create(); - Z3950_query_prefix (s, q); + ZOOM_query_prefix (s, q); - r = Z3950_connection_search (c, s); - Z3950_query_destroy (s); + r = ZOOM_connection_search (c, s); + ZOOM_query_destroy (s); return r; } -Z3950_resultset Z3950_connection_search(Z3950_connection c, Z3950_query q) +ZOOM_resultset ZOOM_connection_search(ZOOM_connection c, ZOOM_query q) { - Z3950_resultset r = Z3950_resultset_create (); - Z3950_task task; + ZOOM_resultset r = ZOOM_resultset_create (); + ZOOM_task task; + const char *cp; r->r_sort_spec = q->sort_spec; r->r_query = q->query; r->search = q; - r->options = Z3950_options_create_with_parent(c->options); + r->options = ZOOM_options_create_with_parent(c->options); - r->start = Z3950_options_get_int(r->options, "start", 0); - r->count = Z3950_options_get_int(r->options, "count", 0); - r->piggyback = Z3950_options_get_bool (r->options, "piggyback", 1); + r->start = ZOOM_options_get_int(r->options, "start", 0); + r->count = ZOOM_options_get_int(r->options, "count", 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->connection = c; r->next = c->resultsets; c->resultsets = r; - task = Z3950_connection_add_task (c, Z3950_TASK_SEARCH); - task->u.resultset = r; - Z3950_resultset_addref (r); + task = ZOOM_connection_add_task (c, ZOOM_TASK_SEARCH); + task->u.search.resultset = r; + ZOOM_resultset_addref (r); (q->refcount)++; if (!c->async) { - while (Z3950_event (1, &c)) + while (ZOOM_event (1, &c)) ; } return r; } -void Z3950_resultset_destroy(Z3950_resultset r) +void ZOOM_resultset_destroy(ZOOM_resultset r) { if (!r) return; @@ -338,7 +419,7 @@ void Z3950_resultset_destroy(Z3950_resultset r) if (r->connection) { /* remove ourselves from the resultsets in connection */ - Z3950_resultset *rp = &r->connection->resultsets; + ZOOM_resultset *rp = &r->connection->resultsets; while (1) { assert (*rp); /* we must be in this list!! */ @@ -350,19 +431,20 @@ void Z3950_resultset_destroy(Z3950_resultset r) rp = &(*rp)->next; } } - Z3950_query_destroy (r->search); - Z3950_options_destroy (r->options); + ZOOM_query_destroy (r->search); + ZOOM_options_destroy (r->options); odr_destroy (r->odr); + xfree (r->setname); xfree (r); } } -int Z3950_resultset_size (Z3950_resultset r) +size_t ZOOM_resultset_size (ZOOM_resultset r) { return r->size; } -static void do_close (Z3950_connection c) +static void do_close (ZOOM_connection c) { if (c->cs) cs_close(c->cs); @@ -371,30 +453,30 @@ static void do_close (Z3950_connection c) c->state = STATE_IDLE; } -static void Z3950_resultset_retrieve (Z3950_resultset r, +static void ZOOM_resultset_retrieve (ZOOM_resultset r, int force_sync, int start, int count) { - Z3950_task task; - Z3950_connection c; + ZOOM_task task; + ZOOM_connection c; if (!r) return; c = r->connection; if (!c) return; - task = Z3950_connection_add_task (c, Z3950_TASK_RETRIEVE); - task->u.resultset = r; - Z3950_resultset_addref (r); + task = ZOOM_connection_add_task (c, ZOOM_TASK_RETRIEVE); + task->u.retrieve.resultset = r; + task->u.retrieve.start = start; + task->u.retrieve.count = count; - r->start = start; - r->count = count; + ZOOM_resultset_addref (r); if (!r->connection->async || force_sync) - while (r->connection && Z3950_event (1, &r->connection)) + while (r->connection && ZOOM_event (1, &r->connection)) ; } -void Z3950_resultset_records (Z3950_resultset r, Z3950_record *recs, +void ZOOM_resultset_records (ZOOM_resultset r, ZOOM_record *recs, size_t start, size_t count) { int force_present = 0; @@ -403,16 +485,16 @@ void Z3950_resultset_records (Z3950_resultset r, Z3950_record *recs, return ; if (count && recs) force_present = 1; - Z3950_resultset_retrieve (r, force_present, start, count); + ZOOM_resultset_retrieve (r, force_present, start, count); if (force_present) { size_t i; for (i = 0; i< count; i++) - recs[i] = Z3950_resultset_record_immediate (r, i+start); + recs[i] = ZOOM_resultset_record_immediate (r, i+start); } } -static void do_connect (Z3950_connection c) +static int do_connect (ZOOM_connection c) { void *add; const char *effective_host; @@ -434,30 +516,34 @@ static void do_connect (Z3950_connection c) if (ret >= 0) { c->state = STATE_CONNECTING; - c->mask = Z3950_SELECT_READ | Z3950_SELECT_WRITE | Z3950_SELECT_EXCEPT; - return; + c->mask = ZOOM_SELECT_EXCEPT; + if (c->cs->io_pending & CS_WANT_WRITE) + c->mask += ZOOM_SELECT_WRITE; + if (c->cs->io_pending & CS_WANT_READ) + c->mask += ZOOM_SELECT_READ; + return 1; } } - c->event_pending = 1; c->state = STATE_IDLE; - c->error = Z3950_ERROR_CONNECT; + c->error = ZOOM_ERROR_CONNECT; + return 0; } -int z3950_connection_socket(Z3950_connection c) +int z3950_connection_socket(ZOOM_connection c) { if (c->cs) return cs_fileno(c->cs); return -1; } -int z3950_connection_mask(Z3950_connection c) +int z3950_connection_mask(ZOOM_connection c) { if (c->cs) return c->mask; return 0; } -static int encode_APDU(Z3950_connection c, Z_APDU *a, ODR out) +static int encode_APDU(ZOOM_connection c, Z_APDU *a, ODR out) { char str[120]; @@ -481,48 +567,50 @@ static int encode_APDU(Z3950_connection c, Z_APDU *a, ODR out) odr_destroy(odr_pr); fclose (outf); } - c->error = Z3950_ERROR_ENCODE; + c->error = ZOOM_ERROR_ENCODE; do_close (c); return -1; } + return 0; } -static int send_APDU (Z3950_connection c, Z_APDU *a) +static int send_APDU (ZOOM_connection c, Z_APDU *a) { + ZOOM_Event event; assert (a); if (encode_APDU(c, a, c->odr_out)) return -1; c->buf_out = odr_getbuf(c->odr_out, &c->len_out, 0); + event = ZOOM_Event_create (ZOOM_EVENT_SEND_APDU); + ZOOM_connection_put_event (c, event); odr_reset(c->odr_out); do_write (c); return 0; } -static int Z3950_connection_send_init (Z3950_connection c) +static int ZOOM_connection_send_init (ZOOM_connection c) { const char *impname; Z_APDU *apdu = zget_APDU(c->odr_out, Z_APDU_initRequest); Z_InitRequest *ireq = apdu->u.initRequest; Z_IdAuthentication *auth = odr_malloc(c->odr_out, sizeof(*auth)); - const char *auth_groupId = Z3950_options_get (c->options, "group"); - const char *auth_userId = Z3950_options_get (c->options, "user"); - const char *auth_password = Z3950_options_get (c->options, "pass"); + const char *auth_groupId = ZOOM_options_get (c->options, "group"); + const char *auth_userId = ZOOM_options_get (c->options, "user"); + const char *auth_password = ZOOM_options_get (c->options, "pass"); ODR_MASK_SET(ireq->options, Z_Options_search); ODR_MASK_SET(ireq->options, Z_Options_present); ODR_MASK_SET(ireq->options, Z_Options_scan); ODR_MASK_SET(ireq->options, Z_Options_sort); -#if 0 ODR_MASK_SET(ireq->options, Z_Options_extendedServices); ODR_MASK_SET(ireq->options, Z_Options_namedResultSets); -#endif ODR_MASK_SET(ireq->protocolVersion, Z_ProtocolVersion_1); ODR_MASK_SET(ireq->protocolVersion, Z_ProtocolVersion_2); ODR_MASK_SET(ireq->protocolVersion, Z_ProtocolVersion_3); - impname = Z3950_options_get (c->options, "implementationName"); + impname = ZOOM_options_get (c->options, "implementationName"); ireq->implementationName = odr_malloc (c->odr_out, 15 + (impname ? strlen(impname) : 0)); strcpy (ireq->implementationName, ""); @@ -534,9 +622,9 @@ static int Z3950_connection_send_init (Z3950_connection c) strcat (ireq->implementationName, "ZOOM-C/YAZ"); *ireq->maximumRecordSize = - Z3950_options_get_int (c->options, "maximumRecordSize", 1024*1024); + ZOOM_options_get_int (c->options, "maximumRecordSize", 1024*1024); *ireq->preferredMessageSize = - Z3950_options_get_int (c->options, "preferredMessageSize", 1024*1024); + ZOOM_options_get_int (c->options, "preferredMessageSize", 1024*1024); if (auth_groupId || auth_password) { @@ -586,9 +674,9 @@ static int Z3950_connection_send_init (Z3950_connection c) return 0; } -static int Z3950_connection_send_search (Z3950_connection c) +static int ZOOM_connection_send_search (ZOOM_connection c) { - Z3950_resultset r; + ZOOM_resultset r; int lslb, ssub, mspn; const char *syntax; Z_APDU *apdu = zget_APDU(c->odr_out, Z_APDU_searchRequest); @@ -596,18 +684,21 @@ static int Z3950_connection_send_search (Z3950_connection c) const char *elementSetName; const char *smallSetElementSetName; const char *mediumSetElementSetName; + const char *schema; assert (c->tasks); - assert (c->tasks->which == Z3950_TASK_SEARCH); + assert (c->tasks->which == ZOOM_TASK_SEARCH); - r = c->tasks->u.resultset; + r = c->tasks->u.search.resultset; elementSetName = - Z3950_options_get (r->options, "elementSetName"); + ZOOM_options_get (r->options, "elementSetName"); smallSetElementSetName = - Z3950_options_get (r->options, "smallSetElementSetName"); + ZOOM_options_get (r->options, "smallSetElementSetName"); mediumSetElementSetName = - Z3950_options_get (r->options, "mediumSetElementSetName"); + ZOOM_options_get (r->options, "mediumSetElementSetName"); + schema = + ZOOM_options_get (r->options, "schema"); if (!smallSetElementSetName) smallSetElementSetName = elementSetName; @@ -622,14 +713,14 @@ static int Z3950_connection_send_search (Z3950_connection c) search_req->query = r->r_query; search_req->databaseNames = - set_DatabaseNames (c, &search_req->num_databaseNames); + set_DatabaseNames (c, r->options, &search_req->num_databaseNames); /* get syntax (no need to provide unless piggyback is in effect) */ - syntax = Z3950_options_get (r->options, "preferredRecordSyntax"); + syntax = ZOOM_options_get (r->options, "preferredRecordSyntax"); - lslb = Z3950_options_get_int (r->options, "largeSetLowerBound", -1); - ssub = Z3950_options_get_int (r->options, "smallSetUpperBound", -1); - mspn = Z3950_options_get_int (r->options, "mediumSetPresentNumber", -1); + lslb = ZOOM_options_get_int (r->options, "largeSetLowerBound", -1); + ssub = ZOOM_options_get_int (r->options, "smallSetUpperBound", -1); + mspn = ZOOM_options_get_int (r->options, "mediumSetPresentNumber", -1); if (lslb != -1 && ssub != -1 && mspn != -1) { /* So're a Z39.50 expert? Let's hope you don't do sort */ @@ -638,7 +729,7 @@ static int Z3950_connection_send_search (Z3950_connection c) *search_req->mediumSetPresentNumber = mspn; } else if (r->start == 0 && r->count > 0 - && r->piggyback && !r->r_sort_spec) + && r->piggyback && !r->r_sort_spec && !schema) { /* Regular piggyback - do it unless we're going to do sort */ *search_req->largeSetLowerBound = 2000000000; @@ -672,14 +763,40 @@ static int Z3950_connection_send_search (Z3950_connection c) if (syntax) search_req->preferredRecordSyntax = yaz_str_to_z3950oid (c->odr_out, CLASS_RECSYN, syntax); - + + if (!r->setname) + { + if (c->support_named_resultsets) + { + char setname[14]; + int ord; + /* find the lowest unused ordinal so that we re-use + result sets on the server. */ + for (ord = 1; ; ord++) + { + ZOOM_resultset rp; + sprintf (setname, "%d", ord); + for (rp = c->resultsets; rp; rp = rp->next) + if (rp->setname && !strcmp (rp->setname, setname)) + break; + if (!rp) + break; + } + r->setname = xstrdup (setname); + yaz_log (LOG_DEBUG, "allocating %s", r->setname); + } + else + r->setname = xstrdup ("default"); + ZOOM_options_set (r->options, "setname", r->setname); + } + search_req->resultSetName = odr_strdup(c->odr_out, r->setname); /* send search request */ send_APDU (c, apdu); r->r_query = 0; return 1; } -static void response_diag (Z3950_connection c, Z_DiagRec *p) +static void response_diag (ZOOM_connection c, Z_DiagRec *p) { Z_DefaultDiagFormat *r; char *addinfo = 0; @@ -688,7 +805,7 @@ static void response_diag (Z3950_connection c, Z_DiagRec *p) c->addinfo = 0; if (p->which != Z_DiagRec_defaultFormat) { - c->error = Z3950_ERROR_DECODE; + c->error = ZOOM_ERROR_DECODE; return; } r = p->u.defaultFormat; @@ -706,12 +823,12 @@ static void response_diag (Z3950_connection c, Z_DiagRec *p) c->error = *r->condition; } -Z3950_record Z3950_record_dup (Z3950_record srec) +ZOOM_record ZOOM_record_clone (ZOOM_record srec) { char *buf; int size; ODR odr_enc; - Z3950_record nrec; + ZOOM_record nrec; odr_enc = odr_createmem(ODR_ENCODE); if (!z_NamePlusRecord (odr_enc, &srec->npr, 0, 0)) @@ -728,21 +845,18 @@ Z3950_record Z3950_record_dup (Z3950_record srec) return nrec; } -Z3950_record Z3950_resultset_record_immediate (Z3950_resultset s,size_t pos) +ZOOM_record ZOOM_resultset_record_immediate (ZOOM_resultset s,size_t pos) { - Z3950_record rec = record_cache_lookup (s, pos, 0); - if (!rec) - return 0; - return Z3950_record_dup (rec); + return record_cache_lookup (s, pos, 0); } -Z3950_record Z3950_resultset_record (Z3950_resultset r, size_t pos) +ZOOM_record ZOOM_resultset_record (ZOOM_resultset r, size_t pos) { - Z3950_resultset_retrieve (r, 1, pos, 1); - return Z3950_resultset_record_immediate (r, pos); + ZOOM_resultset_retrieve (r, 1, pos, 1); + return ZOOM_resultset_record_immediate (r, pos); } -void Z3950_record_destroy (Z3950_record rec) +void ZOOM_record_destroy (ZOOM_record rec) { if (!rec) return; @@ -752,7 +866,7 @@ void Z3950_record_destroy (Z3950_record rec) xfree (rec); } -void *Z3950_record_get (Z3950_record rec, const char *type, size_t *len) +void *ZOOM_record_get (ZOOM_record rec, const char *type, size_t *len) { Z_NamePlusRecord *npr; if (!rec) @@ -820,22 +934,39 @@ void *Z3950_record_get (Z3950_record rec, const char *type, size_t *len) } return 0; } + else if (!strcmp (type, "raw")) + { + if (npr->which == Z_NamePlusRecord_databaseRecord) + { + Z_External *r = (Z_External *) npr->u.databaseRecord; + + if (r->which == Z_External_sutrs) + { + *len = r->u.sutrs->len; + return r->u.sutrs->buf; + } + else if (r->which == Z_External_octet) + { + *len = r->u.octet_aligned->len; + return r->u.octet_aligned->buf; + } + else /* grs-1, explain, ... */ + { + *len = -1; + return (Z_External *) npr->u.databaseRecord; + } + } + return 0; + } return 0; } -void *Z3950_resultset_get (Z3950_resultset s, size_t pos, const char *type, - size_t *len) -{ - Z3950_record rec = record_cache_lookup (s, pos, 0); - return Z3950_record_get (rec, type, len); -} - -static void record_cache_add (Z3950_resultset r, +static void record_cache_add (ZOOM_resultset r, Z_NamePlusRecord *npr, int pos, const char *elementSetName) { - Z3950_record_cache rc; + ZOOM_record_cache rc; for (rc = r->record_cache; rc; rc = rc->next) { @@ -866,11 +997,11 @@ static void record_cache_add (Z3950_resultset r, r->record_cache = rc; } -static Z3950_record record_cache_lookup (Z3950_resultset r, +static ZOOM_record record_cache_lookup (ZOOM_resultset r, int pos, const char *elementSetName) { - Z3950_record_cache rc; + ZOOM_record_cache rc; for (rc = r->record_cache; rc; rc = rc->next) { @@ -885,19 +1016,24 @@ static Z3950_record record_cache_lookup (Z3950_resultset r, return 0; } -static void handle_records (Z3950_connection c, Z_Records *sr, +static void handle_records (ZOOM_connection c, Z_Records *sr, int present_phase) { - Z3950_resultset resultset; + ZOOM_resultset resultset; if (!c->tasks) return ; - if (c->tasks->which != Z3950_TASK_SEARCH && - c->tasks->which != Z3950_TASK_RETRIEVE) - return ; - - resultset = c->tasks->u.resultset; - + switch (c->tasks->which) + { + case ZOOM_TASK_SEARCH: + resultset = c->tasks->u.search.resultset; + break; + case ZOOM_TASK_RETRIEVE: + resultset = c->tasks->u.retrieve.resultset; + break; + default: + return; + } if (sr && sr->which == Z_Records_NSD) { Z_DiagRec dr, *dr_p = &dr; @@ -911,7 +1047,7 @@ static void handle_records (Z3950_connection c, Z_Records *sr, if (sr->u.multipleNonSurDiagnostics->num_diagRecs >= 1) response_diag(c, sr->u.multipleNonSurDiagnostics->diagRecs[0]); else - c->error = Z3950_ERROR_DECODE; + c->error = ZOOM_ERROR_DECODE; } else { @@ -936,51 +1072,77 @@ static void handle_records (Z3950_connection c, Z_Records *sr, if (present_phase && p->num_records == 0) { /* present response and we didn't get any records! */ - c->error = Z3950_ERROR_DECODE; + c->error = ZOOM_ERROR_DECODE; } } else if (present_phase) { /* present response and we didn't get any records! */ - c->error = Z3950_ERROR_DECODE; + c->error = ZOOM_ERROR_DECODE; } } } -static void handle_present_response (Z3950_connection c, Z_PresentResponse *pr) +static void handle_present_response (ZOOM_connection c, Z_PresentResponse *pr) { handle_records (c, pr->records, 1); } -static void handle_search_response (Z3950_connection c, Z_SearchResponse *sr) +static void handle_search_response (ZOOM_connection c, Z_SearchResponse *sr) { - Z3950_resultset resultset; + ZOOM_resultset resultset; yaz_log (LOG_DEBUG, "got search response"); - if (!c->tasks || c->tasks->which != Z3950_TASK_SEARCH) + if (!c->tasks || c->tasks->which != ZOOM_TASK_SEARCH) return ; - resultset = c->tasks->u.resultset; + resultset = c->tasks->u.search.resultset; resultset->size = *sr->resultCount; handle_records (c, sr->records, 0); } -static void sort_response (Z3950_connection c, Z_SortResponse *res) +static void sort_response (ZOOM_connection c, Z_SortResponse *res) { if (res->diagnostics && res->num_diagnostics > 0) response_diag (c, res->diagnostics[0]); } -static int send_sort (Z3950_connection c) +static int scan_response (ZOOM_connection c, Z_ScanResponse *res) { - Z3950_resultset resultset; + NMEM nmem = odr_extract_mem (c->odr_in); + ZOOM_scanset scan; + + if (!c->tasks || c->tasks->which != ZOOM_TASK_SCAN) + return 0; + scan = c->tasks->u.scan.scan; + + if (res->entries && res->entries->nonsurrogateDiagnostics) + response_diag(c, res->entries->nonsurrogateDiagnostics[0]); + scan->scan_response = res; + nmem_transfer (scan->odr->mem, nmem); + if (res->stepSize) + ZOOM_options_set_int (scan->options, "stepSize", *res->stepSize); + if (res->positionOfTerm) + ZOOM_options_set_int (scan->options, "position", *res->positionOfTerm); + if (res->scanStatus) + ZOOM_options_set_int (scan->options, "scanStatus", *res->scanStatus); + if (res->numberOfEntriesReturned) + ZOOM_options_set_int (scan->options, "number", + *res->numberOfEntriesReturned); + nmem_destroy (nmem); + return 1; +} - if (!c->tasks || c->tasks->which != Z3950_TASK_SEARCH) +static int send_sort (ZOOM_connection c) +{ + ZOOM_resultset resultset; + + if (!c->tasks || c->tasks->which != ZOOM_TASK_SEARCH) return 0; - resultset = c->tasks->u.resultset; + resultset = c->tasks->u.search.resultset; if (c->error) { @@ -995,8 +1157,9 @@ static int send_sort (Z3950_connection c) req->num_inputResultSetNames = 1; req->inputResultSetNames = (Z_InternationalString **) odr_malloc (c->odr_out, sizeof(*req->inputResultSetNames)); - req->inputResultSetNames[0] = odr_strdup (c->odr_out, "default"); - req->sortedResultSetName = odr_strdup (c->odr_out, "default"); + req->inputResultSetNames[0] = + odr_strdup (c->odr_out, resultset->setname); + req->sortedResultSetName = odr_strdup (c->odr_out, resultset->setname); req->sortSequence = resultset->r_sort_spec; resultset->r_sort_spec = 0; send_APDU (c, apdu); @@ -1005,32 +1168,48 @@ static int send_sort (Z3950_connection c) return 0; } -static int send_present (Z3950_connection c) +static int send_present (ZOOM_connection c) { Z_APDU *apdu = zget_APDU(c->odr_out, Z_APDU_presentRequest); Z_PresentRequest *req = apdu->u.presentRequest; int i = 0; const char *syntax = - Z3950_options_get (c->options, "preferredRecordSyntax"); + ZOOM_options_get (c->options, "preferredRecordSyntax"); const char *element = - Z3950_options_get (c->options, "elementSetName"); - Z3950_resultset resultset; + ZOOM_options_get (c->options, "elementSetName"); + const char *schema = + ZOOM_options_get (c->options, "schema"); + ZOOM_resultset resultset; if (!c->tasks) return 0; - if (c->tasks->which != Z3950_TASK_SEARCH && - c->tasks->which != Z3950_TASK_RETRIEVE) - return 0; - resultset = c->tasks->u.resultset; - + switch (c->tasks->which) + { + case ZOOM_TASK_SEARCH: + resultset = c->tasks->u.search.resultset; + break; + case ZOOM_TASK_RETRIEVE: + resultset = c->tasks->u.retrieve.resultset; + resultset->start = c->tasks->u.retrieve.start; + resultset->count = c->tasks->u.retrieve.count; + + if (resultset->start >= resultset->size) + return 0; + if (resultset->start + resultset->count > resultset->size) + resultset->count = resultset->size - resultset->start; + break; + default: + return 0; + } + if (c->error) /* don't continue on error */ return 0; if (resultset->start < 0) return 0; for (i = 0; icount; i++) { - Z3950_record rec = + ZOOM_record rec = record_cache_lookup (resultset, i + resultset->start, 0); if (!rec) break; @@ -1048,7 +1227,48 @@ static int send_present (Z3950_connection c) req->preferredRecordSyntax = yaz_str_to_z3950oid (c->odr_out, CLASS_RECSYN, syntax); - if (element && *element) + if (schema && *schema) + { + Z_RecordComposition *compo = odr_malloc (c->odr_out, sizeof(*compo)); + + req->recordComposition = compo; + compo->which = Z_RecordComp_complex; + compo->u.complex = (Z_CompSpec *) + odr_malloc(c->odr_out, sizeof(*compo->u.complex)); + compo->u.complex->selectAlternativeSyntax = (bool_t *) + odr_malloc(c->odr_out, sizeof(bool_t)); + *compo->u.complex->selectAlternativeSyntax = 0; + + compo->u.complex->generic = (Z_Specification *) + odr_malloc(c->odr_out, sizeof(*compo->u.complex->generic)); + + compo->u.complex->generic->schema = (Odr_oid *) + yaz_str_to_z3950oid (c->odr_out, CLASS_SCHEMA, schema); + + if (!compo->u.complex->generic->schema) + { + /* OID wasn't a schema! Try record syntax instead. */ + + compo->u.complex->generic->schema = (Odr_oid *) + yaz_str_to_z3950oid (c->odr_out, CLASS_RECSYN, schema); + } + if (element && *element) + { + compo->u.complex->generic->elementSpec = (Z_ElementSpec *) + odr_malloc(c->odr_out, sizeof(Z_ElementSpec)); + compo->u.complex->generic->elementSpec->which = + Z_ElementSpec_elementSetName; + compo->u.complex->generic->elementSpec->u.elementSetName = + odr_strdup (c->odr_out, element); + } + else + compo->u.complex->generic->elementSpec = 0; + compo->u.complex->num_dbSpecific = 0; + compo->u.complex->dbSpecific = 0; + compo->u.complex->num_recordSyntax = 0; + compo->u.complex->recordSyntax = 0; + } + else if (element && *element) { Z_ElementSetNames *esn = odr_malloc (c->odr_out, sizeof(*esn)); Z_RecordComposition *compo = odr_malloc (c->odr_out, sizeof(*compo)); @@ -1059,43 +1279,168 @@ static int send_present (Z3950_connection c) compo->u.simple = esn; req->recordComposition = compo; } + req->resultSetId = odr_strdup(c->odr_out, resultset->setname); + send_APDU (c, apdu); + return 1; +} + +ZOOM_scanset ZOOM_connection_scan (ZOOM_connection c, const char *start) +{ + ZOOM_scanset scan = xmalloc (sizeof(*scan)); + + scan->connection = c; + scan->odr = odr_createmem (ODR_DECODE); + scan->options = ZOOM_options_create_with_parent (c->options); + scan->refcount = 1; + scan->scan_response = 0; + + if ((scan->termListAndStartPoint = + p_query_scan(scan->odr, PROTO_Z3950, &scan->attributeSet, + start))) + { + ZOOM_task task = ZOOM_connection_add_task (c, ZOOM_TASK_SCAN); + task->u.scan.scan = scan; + + (scan->refcount)++; + if (!c->async) + { + while (ZOOM_event (1, &c)) + ; + } + } + return scan; +} + +void ZOOM_scanset_destroy (ZOOM_scanset scan) +{ + if (!scan) + return; + (scan->refcount)--; + if (scan->refcount == 0) + { + odr_destroy (scan->odr); + + ZOOM_options_destroy (scan->options); + xfree (scan); + } +} + +int send_scan (ZOOM_connection c) +{ + ZOOM_scanset scan; + Z_APDU *apdu = zget_APDU(c->odr_out, Z_APDU_scanRequest); + Z_ScanRequest *req = apdu->u.scanRequest; + if (!c->tasks) + return 0; + assert (c->tasks->which == ZOOM_TASK_SCAN); + scan = c->tasks->u.scan.scan; + + req->termListAndStartPoint = scan->termListAndStartPoint; + req->attributeSet = scan->attributeSet; + + *req->numberOfTermsRequested = + ZOOM_options_get_int(scan->options, "number", 10); + + req->preferredPositionInResponse = + odr_intdup (c->odr_out, + ZOOM_options_get_int(scan->options, "position", 1)); + + req->stepSize = + odr_intdup (c->odr_out, + ZOOM_options_get_int(scan->options, "stepSize", 0)); + + req->databaseNames = set_DatabaseNames (c, scan->options, + &req->num_databaseNames); + send_APDU (c, apdu); + return 1; } -static int Z3950_connection_exec_task (Z3950_connection c) +size_t ZOOM_scanset_size (ZOOM_scanset scan) +{ + if (!scan || !scan->scan_response || !scan->scan_response->entries) + return 0; + return scan->scan_response->entries->num_entries; +} + +const char *ZOOM_scanset_term (ZOOM_scanset scan, size_t pos, + int *occ, size_t *len) +{ + const char *term = 0; + size_t noent = ZOOM_scanset_size (scan); + Z_ScanResponse *res = scan->scan_response; + + *len = 0; + *occ = 0; + if (pos >= noent) + return 0; + if (res->entries->entries[pos]->which == Z_Entry_termInfo) + { + Z_TermInfo *t = res->entries->entries[pos]->u.termInfo; + + if (t->term->which == Z_Term_general) + { + term = t->term->u.general->buf; + *len = t->term->u.general->len; + } + *occ = t->globalOccurrences ? *t->globalOccurrences : 0; + } + return term; +} + +const char *ZOOM_scanset_option_get (ZOOM_scanset scan, const char *key) { - Z3950_task task = c->tasks; + return ZOOM_options_get (scan->options, key); +} - yaz_log (LOG_DEBUG, "Z3950_connection_exec_task"); +void ZOOM_scanset_option_set (ZOOM_scanset scan, const char *key, + const char *val) +{ + ZOOM_options_set (scan->options, key, val); +} + +static int ZOOM_connection_exec_task (ZOOM_connection c) +{ + ZOOM_task task = c->tasks; + + yaz_log (LOG_DEBUG, "ZOOM_connection_exec_task"); if (!task) return 0; - if (c->error != Z3950_ERROR_NONE || !c->cs) + if (c->error != ZOOM_ERROR_NONE || + (!c->cs && task->which != ZOOM_TASK_CONNECT)) { - Z3950_connection_remove_tasks (c); + ZOOM_connection_remove_tasks (c); return 0; } - yaz_log (LOG_DEBUG, "Z3950_connection_exec_task type=%d", task->which); + yaz_log (LOG_DEBUG, "ZOOM_connection_exec_task type=%d", task->which); if (task->running) return 0; task->running = 1; switch (task->which) { - case Z3950_TASK_SEARCH: + case ZOOM_TASK_SEARCH: /* see if search hasn't been sent yet. */ - if (Z3950_connection_send_search (c)) + if (ZOOM_connection_send_search (c)) return 1; break; - case Z3950_TASK_RETRIEVE: + case ZOOM_TASK_RETRIEVE: if (send_present (c)) return 1; break; + case ZOOM_TASK_CONNECT: + if (do_connect(c)) + return 1; + break; + case ZOOM_TASK_SCAN: + if (send_scan(c)) + return 1; } - Z3950_connection_remove_task (c); + ZOOM_connection_remove_task (c); return 0; } -static int send_sort_present (Z3950_connection c) +static int send_sort_present (ZOOM_connection c) { int r = send_sort (c); if (!r) @@ -1103,7 +1448,7 @@ static int send_sort_present (Z3950_connection c) return r; } -static void handle_apdu (Z3950_connection c, Z_APDU *apdu) +static void handle_apdu (ZOOM_connection c, Z_APDU *apdu) { Z_InitResponse *initrs; @@ -1115,7 +1460,7 @@ static void handle_apdu (Z3950_connection c, Z_APDU *apdu) initrs = apdu->u.initResponse; if (!*initrs->result) { - c->error = Z3950_ERROR_INIT; + c->error = ZOOM_ERROR_INIT; } else { @@ -1126,46 +1471,65 @@ static void handle_apdu (Z3950_connection c, Z_APDU *apdu) c->cookie_in = 0; if (cookie) c->cookie_in = xstrdup(cookie); - Z3950_connection_exec_task (c); + if (ODR_MASK_GET(initrs->options, Z_Options_namedResultSets) && + ODR_MASK_GET(initrs->protocolVersion, Z_ProtocolVersion_3)) + c->support_named_resultsets = 1; + if (c->tasks) + { + assert (c->tasks->which == ZOOM_TASK_CONNECT); + ZOOM_connection_remove_task (c); + } + ZOOM_connection_exec_task (c); } break; case Z_APDU_searchResponse: handle_search_response (c, apdu->u.searchResponse); if (!send_sort_present (c)) - Z3950_connection_remove_task (c); + ZOOM_connection_remove_task (c); break; case Z_APDU_presentResponse: handle_present_response (c, apdu->u.presentResponse); if (!send_present (c)) - Z3950_connection_remove_task (c); + ZOOM_connection_remove_task (c); break; case Z_APDU_sortResponse: sort_response (c, apdu->u.sortResponse); if (!send_present (c)) - Z3950_connection_remove_task (c); + ZOOM_connection_remove_task (c); + break; + case Z_APDU_scanResponse: + scan_response (c, apdu->u.scanResponse); + ZOOM_connection_remove_task (c); } } -static int do_read (Z3950_connection c) +static int do_read (ZOOM_connection c) { int r; Z_APDU *apdu; + ZOOM_Event 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); if (r == 1) return 0; if (r <= 0) { - c->error= Z3950_ERROR_CONNECTION_LOST; + c->error= ZOOM_ERROR_CONNECTION_LOST; do_close (c); } else { + ZOOM_Event event; odr_reset (c->odr_in); odr_setbuf (c->odr_in, c->buf_in, r, 0); + event = ZOOM_Event_create (ZOOM_EVENT_RECV_APDU); + ZOOM_connection_put_event (c, event); if (!z_APDU (c->odr_in, &apdu, 0, 0)) { - c->error = Z3950_ERROR_DECODE; + c->error = ZOOM_ERROR_DECODE; do_close (c); } else @@ -1176,80 +1540,89 @@ static int do_read (Z3950_connection c) return 1; } -static int do_write_ex (Z3950_connection c, char *buf_out, int len_out) +static int do_write_ex (ZOOM_connection c, char *buf_out, int len_out) { int r; + ZOOM_Event event; + event = ZOOM_Event_create(ZOOM_EVENT_SEND_DATA); + ZOOM_connection_put_event (c, event); + if ((r=cs_put (c->cs, buf_out, len_out)) < 0) { if (c->state == STATE_CONNECTING) - c->error = Z3950_ERROR_CONNECT; + c->error = ZOOM_ERROR_CONNECT; else - c->error = Z3950_ERROR_CONNECTION_LOST; + c->error = ZOOM_ERROR_CONNECTION_LOST; do_close (c); return 1; } else if (r == 1) - { - c->state = STATE_ESTABLISHED; - c->mask = Z3950_SELECT_READ|Z3950_SELECT_WRITE; + { + c->mask = ZOOM_SELECT_EXCEPT; + if (c->cs->io_pending & CS_WANT_WRITE) + c->mask += ZOOM_SELECT_WRITE; + if (c->cs->io_pending & CS_WANT_READ) + c->mask += ZOOM_SELECT_READ; + yaz_log (LOG_DEBUG, "do_write_ex 1 mask=%d", c->mask); } else { - c->state = STATE_ESTABLISHED; - c->mask = Z3950_SELECT_READ; + c->mask = ZOOM_SELECT_READ|ZOOM_SELECT_EXCEPT; + yaz_log (LOG_DEBUG, "do_write_ex 2 mask=%d", c->mask); } return 0; } -static int do_write(Z3950_connection c) +static int do_write(ZOOM_connection c) { return do_write_ex (c, c->buf_out, c->len_out); } -const char *Z3950_connection_option (Z3950_connection c, const char *key, - const char *val) + +const char *ZOOM_connection_option_get (ZOOM_connection c, const char *key) { - const char *old_val = Z3950_options_get (c->options, key); - if (val) - { - Z3950_options_set (c->options, key, val); - } - return old_val; + return ZOOM_options_get (c->options, key); } -const char *Z3950_resultset_option (Z3950_resultset r, const char *key, - const char *val) +void ZOOM_connection_option_set (ZOOM_connection c, const char *key, + const char *val) { - const char *old_val = Z3950_options_get (r->options, key); - if (val) - { - Z3950_options_set (r->options, key, val); - } - return old_val; + ZOOM_options_set (c->options, key, val); +} + +const char *ZOOM_resultset_option_get (ZOOM_resultset r, const char *key) +{ + return ZOOM_options_get (r->options, key); +} + +void ZOOM_resultset_option_set (ZOOM_resultset r, const char *key, + const char *val) +{ + ZOOM_options_set (r->options, key, val); } -int Z3950_connection_errcode (Z3950_connection c) +int ZOOM_connection_errcode (ZOOM_connection c) { - return Z3950_connection_error (c, 0, 0); + return ZOOM_connection_error (c, 0, 0); } -const char *Z3950_connection_errmsg (Z3950_connection c) +const char *ZOOM_connection_errmsg (ZOOM_connection c) { const char *msg; - Z3950_connection_error (c, &msg, 0); + ZOOM_connection_error (c, &msg, 0); return msg; } -const char *Z3950_connection_addinfo (Z3950_connection c) +const char *ZOOM_connection_addinfo (ZOOM_connection c) { const char *addinfo; - Z3950_connection_error (c, 0, &addinfo); + ZOOM_connection_error (c, 0, &addinfo); return addinfo; } -int Z3950_connection_error (Z3950_connection c, const char **cp, +int ZOOM_connection_error (ZOOM_connection c, const char **cp, const char **addinfo) { int error = c->error; @@ -1257,23 +1630,23 @@ int Z3950_connection_error (Z3950_connection c, const char **cp, { switch (error) { - case Z3950_ERROR_NONE: + case ZOOM_ERROR_NONE: *cp = "No error"; break; - case Z3950_ERROR_CONNECT: + case ZOOM_ERROR_CONNECT: *cp = "Connect failed"; break; - case Z3950_ERROR_MEMORY: + case ZOOM_ERROR_MEMORY: *cp = "Out of memory"; break; - case Z3950_ERROR_ENCODE: + case ZOOM_ERROR_ENCODE: *cp = "Encoding failed"; break; - case Z3950_ERROR_DECODE: + case ZOOM_ERROR_DECODE: *cp = "Decoding failed"; break; - case Z3950_ERROR_CONNECTION_LOST: + case ZOOM_ERROR_CONNECTION_LOST: *cp = "Connection lost"; break; - case Z3950_ERROR_INIT: + case ZOOM_ERROR_INIT: *cp = "Init rejected"; break; - case Z3950_ERROR_INTERNAL: + case ZOOM_ERROR_INTERNAL: *cp = "Internal failure"; break; - case Z3950_ERROR_TIMEOUT: + case ZOOM_ERROR_TIMEOUT: *cp = "Timeout"; break; default: *cp = diagbib1_str (error); @@ -1289,92 +1662,115 @@ int Z3950_connection_error (Z3950_connection c, const char **cp, return c->error; } -int Z3950_connection_do_io(Z3950_connection c, int mask) +int ZOOM_connection_do_io(ZOOM_connection c, int mask) { -#if 0 + ZOOM_Event event = 0; int r = cs_look(c->cs); - yaz_log (LOG_DEBUG, "Z3950_connection_do_io c=%p mask=%d cs_look=%d", + yaz_log (LOG_DEBUG, "ZOOM_connection_do_io c=%p mask=%d cs_look=%d", c, mask, r); if (r == CS_NONE) { - c->error = Z3950_ERROR_CONNECT; + event = ZOOM_Event_create (ZOOM_EVENT_CONNECT); + c->error = ZOOM_ERROR_CONNECT; do_close (c); + ZOOM_connection_put_event (c, event); } else if (r == CS_CONNECT) { - yaz_log (LOG_DEBUG, "calling rcvconnect"); - if (cs_rcvconnect (c->cs) < 0) - { - c->error = Z3950_ERROR_CONNECT; - do_close (c); - } - else - Z3950_connection_send_init (c); - } - else - { - if (mask & Z3950_SELECT_READ) - do_read (c); - if (c->cs && (mask & Z3950_SELECT_WRITE)) - do_write (c); - } -#else - yaz_log (LOG_DEBUG, "Z3950_connection_do_io c=%p mask=%d", c, mask); - if (c->state == STATE_CONNECTING) - { - if (mask & Z3950_SELECT_WRITE) - Z3950_connection_send_init (c); - else - { - c->error = Z3950_ERROR_CONNECT; - do_close (c); - } - } - else if (c->state == STATE_ESTABLISHED) - { - if (mask & Z3950_SELECT_READ) - do_read (c); - if (c->cs && (mask & Z3950_SELECT_WRITE)) - do_write (c); + int ret; + event = ZOOM_Event_create (ZOOM_EVENT_CONNECT); + + ret = cs_rcvconnect (c->cs); + yaz_log (LOG_DEBUG, "cs_rcvconnect returned %d", ret); + if (ret == 1) + { + c->mask = ZOOM_SELECT_EXCEPT; + if (c->cs->io_pending & CS_WANT_WRITE) + c->mask += ZOOM_SELECT_WRITE; + if (c->cs->io_pending & CS_WANT_READ) + c->mask += ZOOM_SELECT_READ; + ZOOM_connection_put_event (c, event); + } + else if (ret == 0) + { + ZOOM_connection_put_event (c, event); + ZOOM_connection_send_init (c); + c->state = STATE_ESTABLISHED; + } + else + { + c->error = ZOOM_ERROR_CONNECT; + do_close (c); + ZOOM_connection_put_event (c, event); + } } else { - c->error = Z3950_ERROR_INTERNAL; - do_close (c); + if (mask & ZOOM_SELECT_READ) + do_read (c); + if (c->cs && (mask & ZOOM_SELECT_WRITE)) + do_write (c); } -#endif - c->event_pending = 1; return 1; } -int Z3950_event (int no, Z3950_connection *cs) +int ZOOM_connection_last_event(ZOOM_connection cs) +{ + if (!cs) + return ZOOM_EVENT_NONE; + return cs->last_event; +} + +int ZOOM_event (int no, ZOOM_connection *cs) { +#if HAVE_SYS_POLL_H + struct pollfd pollfds[1024]; + ZOOM_connection poll_cs[1024]; +#else struct timeval tv; fd_set input, output, except; - int i, r; +#endif + int i, r, nfds; int max_fd = 0; for (i = 0; ievent_pending) - { - c->event_pending = 0; + ZOOM_connection c = cs[i]; + ZOOM_Event event; + if (c && (event = ZOOM_connection_get_event(c))) + { + ZOOM_Event_destroy (event); return i+1; - } + } } + for (i = 0; ics && c->host_port && c->error == Z3950_ERROR_NONE) - { - do_connect (c); - return i+1; - } - else - { - if (Z3950_connection_exec_task (c)) - return i+1; - } - } - yaz_log (LOG_DEBUG, "no more events"); - return 0; + ZOOM_connection c = poll_cs[i]; + if (r && c->mask) + { + int mask = 0; + if (pollfds[i].revents & POLLIN) + mask += ZOOM_SELECT_READ; + if (pollfds[i].revents & POLLOUT) + mask += ZOOM_SELECT_WRITE; + if (pollfds[i].revents & POLLERR) + mask += ZOOM_SELECT_EXCEPT; + if (mask) + ZOOM_connection_do_io(c, mask); + } + else if (r == 0 && c->mask) + { + ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_TIMEOUT); + /* timeout and this connection was waiting */ + c->error = ZOOM_ERROR_TIMEOUT; + do_close (c); + ZOOM_connection_put_event(c, event); + } } +#else yaz_log (LOG_DEBUG, "select start"); r = select (max_fd+1, &input, &output, &except, &tv); yaz_log (LOG_DEBUG, "select stop, returned r=%d", r); - for (i = 0; imask) { + ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_TIMEOUT); /* timeout and this connection was waiting */ - c->error = Z3950_ERROR_TIMEOUT; - c->event_pending = 1; + c->error = ZOOM_ERROR_TIMEOUT; + do_close (c); + yaz_log (LOG_DEBUG, "timeout"); + ZOOM_connection_put_event(c, event); } } +#endif for (i = 0; ievent_pending) - { - c->event_pending = 0; + ZOOM_connection c = cs[i]; + ZOOM_Event event; + if (c && (event = ZOOM_connection_get_event(c))) + { + ZOOM_Event_destroy (event); return i+1; - } + } } return 0; }