return send_APDU(c, apdu);
}
-zoom_ret ZOOM_connection_Z3950_send_search(ZOOM_connection c)
+static zoom_ret Z3950_send_search(ZOOM_connection c)
{
ZOOM_resultset r;
int lslb, ssub, mspn;
const char *mediumSetElementSetName;
const char *facets;
- if (!c->tasks)
- return zoom_complete;
-
+ assert(c->tasks);
assert(c->tasks->which == ZOOM_TASK_SEARCH);
r = c->tasks->u.search.resultset;
- if (r->live_set)
- return send_Z3950_present(c);
apdu = zget_APDU(c->odr_out, Z_APDU_searchRequest);
search_req = apdu->u.searchRequest;
yaz_log(c->log_details, "%p ZOOM_connection_send_search set=%p", c, r);
- elementSetName =
- ZOOM_options_get(r->options, "elementSetName");
+ elementSetName = c->tasks->u.search.elementSetName;
smallSetElementSetName =
ZOOM_options_get(r->options, "smallSetElementSetName");
mediumSetElementSetName =
if (!c->tasks || c->tasks->which != ZOOM_TASK_SEARCH)
return;
- event = ZOOM_Event_create(ZOOM_EVENT_RECV_SEARCH);
- ZOOM_connection_put_event(c, event);
-
resultset = c->tasks->u.search.resultset;
+ if (resultset->live_set == 0)
+ {
+ event = ZOOM_Event_create(ZOOM_EVENT_RECV_SEARCH);
+ ZOOM_connection_put_event(c, event);
+ }
if (sr->resultSetStatus)
{
ZOOM_options_set_int(resultset->options, "resultSetStatus",
handle_facet_result(c, resultset, sr->additionalSearchInfo);
resultset->size = *sr->resultCount;
- resultset->live_set = 1;
+ resultset->live_set = 2;
#if HAVE_LIBMEMCACHED_MEMCACHED_H
if (c->mc_st)
rc = memcached_set(c->mc_st,
wrbuf_buf(resultset->mc_key),wrbuf_len(resultset->mc_key),
str, strlen(str), expiration, flags);
- yaz_log(YLOG_LOG, "Store hit count key=%s value=%s rc=%u %s",
+ yaz_log(YLOG_LOG, "Store Z39.50 hit count key=%s value=%s rc=%u %s",
wrbuf_cstr(resultset->mc_key), str, (unsigned) rc,
memcached_last_error_message(c->mc_st));
}
return zoom_complete;
}
-zoom_ret send_Z3950_present(ZOOM_connection c)
+static zoom_ret Z3950_send_present(ZOOM_connection c)
{
- Z_APDU *apdu = 0;
- Z_PresentRequest *req = 0;
- int i = 0;
- const char *syntax = 0;
- const char *elementSetName = 0;
- const char *schema = 0;
- ZOOM_resultset resultset;
- int *start, *count;
-
- if (!c->tasks)
- return zoom_complete;
- assert(c->tasks->which == ZOOM_TASK_SEARCH);
- 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;
- schema = c->tasks->u.search.schema;
-
- yaz_log(c->log_details, "%p send_present start=%d count=%d",
- c, *start, *count);
-
- if (*start < 0 || *count < 0 || *start + *count > resultset->size)
- {
- ZOOM_set_dset_error(c, YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE, "Bib-1",
- "", 0);
- }
- if (c->error) /* don't continue on error */
- return zoom_complete;
- yaz_log(c->log_details, "send_present resultset=%p start=%d count=%d",
- resultset, *start, *count);
-
- for (i = 0; i < *count; i++)
- {
- ZOOM_record rec =
- ZOOM_record_cache_lookup(resultset, i + *start,
- syntax, elementSetName, schema);
- if (!rec)
- break;
- else
- {
- ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_RECV_RECORD);
- ZOOM_connection_put_event(c, event);
- }
- }
- *start += i;
- *count -= i;
-
- if (*count == 0)
- {
- yaz_log(c->log_details, "%p send_present skip=%d no more to fetch", c, i);
- return zoom_complete;
- }
-
- apdu = zget_APDU(c->odr_out, Z_APDU_presentRequest);
- req = apdu->u.presentRequest;
-
- if (i)
- yaz_log(c->log_details, "%p send_present skip=%d", c, i);
+ Z_APDU *apdu = zget_APDU(c->odr_out, Z_APDU_presentRequest);
+ Z_PresentRequest *req = apdu->u.presentRequest;
+ ZOOM_resultset resultset = c->tasks->u.search.resultset;
+ const char *syntax = c->tasks->u.search.syntax;
+ const char *elementSetName = c->tasks->u.search.elementSetName;
+ const char *schema = c->tasks->u.search.schema;
- *req->resultSetStartPoint = *start + 1;
+ *req->resultSetStartPoint = c->tasks->u.search.start + 1;
- if (resultset->step > 0 && resultset->step < *count)
+ if (resultset->step > 0 && resultset->step < c->tasks->u.search.count)
*req->numberOfRecordsRequested = resultset->step;
else
- *req->numberOfRecordsRequested = *count;
+ *req->numberOfRecordsRequested = c->tasks->u.search.count;
- if (*req->numberOfRecordsRequested + *start > resultset->size)
- *req->numberOfRecordsRequested = resultset->size - *start;
+ if (*req->numberOfRecordsRequested + c->tasks->u.search.start > resultset->size)
+ *req->numberOfRecordsRequested = resultset->size - c->tasks->u.search.start;
assert(*req->numberOfRecordsRequested > 0);
if (syntax && *syntax)
return send_APDU(c, apdu);
}
+zoom_ret ZOOM_connection_Z3950_search(ZOOM_connection c)
+{
+ int i = 0;
+ const char *syntax = 0;
+ const char *elementSetName = 0;
+ const char *schema = 0;
+ ZOOM_resultset resultset;
+ int *start, *count;
+
+ if (!c->tasks)
+ return zoom_complete;
+ assert(c->tasks->which == ZOOM_TASK_SEARCH);
+ 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;
+ schema = c->tasks->u.search.schema;
+
+ yaz_log(c->log_details, "%p send_present start=%d count=%d",
+ c, *start, *count);
+
+ if (*start < 0 || *count < 0)
+ {
+ ZOOM_set_dset_error(c, YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE, "Bib-1",
+ "", 0);
+ }
+ if (resultset->live_set && *start + *count > resultset->size)
+ {
+ ZOOM_set_dset_error(c, YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE, "Bib-1",
+ "", 0);
+ }
+
+ if (c->error) /* don't continue on error */
+ return zoom_complete;
+ yaz_log(c->log_details, "send_present resultset=%p start=%d count=%d",
+ resultset, *start, *count);
+
+ for (i = 0; i < *count; i++)
+ {
+ ZOOM_record rec =
+ ZOOM_record_cache_lookup(resultset, i + *start,
+ syntax, elementSetName, schema);
+ if (!rec)
+ break;
+ else
+ {
+ ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_RECV_RECORD);
+ ZOOM_connection_put_event(c, event);
+ }
+ }
+ *start += i;
+ *count -= i;
+
+ if (*count == 0 && resultset->live_set)
+ return zoom_complete;
+
+ if (resultset->live_set == 2)
+ return Z3950_send_present(c);
+ else
+ return Z3950_send_search(c);
+}
+
static zoom_ret send_Z3950_sort_present(ZOOM_connection c)
{
zoom_ret r = zoom_complete;
if (c->tasks && c->tasks->which == ZOOM_TASK_SEARCH)
r = send_Z3950_sort(c, c->tasks->u.search.resultset);
if (r == zoom_complete)
- r = send_Z3950_present(c);
+ r = ZOOM_connection_Z3950_search(c);
return r;
}
case Z_APDU_presentResponse:
yaz_log(c->log_api, "%p handle_Z3950_apdu Present response", c);
handle_Z3950_present_response(c, apdu->u.presentResponse);
- if (send_Z3950_present(c) == zoom_complete)
+ if (ZOOM_connection_Z3950_search(c) == zoom_complete)
ZOOM_connection_remove_task(c);
break;
case Z_APDU_sortResponse:
yaz_log(c->log_api, "%p handle_Z3950_apdu Sort response", c);
handle_Z3950_sort_response(c, apdu->u.sortResponse);
- if (send_Z3950_present(c) == zoom_complete)
- ZOOM_connection_remove_task(c);
+ ZOOM_connection_remove_task(c);
break;
case Z_APDU_scanResponse:
yaz_log(c->log_api, "%p handle_Z3950_apdu Scan response", c);
projects / yaz-moved-to-github.git / blobdiff