* Copyright (c) 2000-2003, Index Data
* See the file LICENSE for details.
*
- * $Id: zoom-c.c,v 1.31 2003-04-23 20:38:19 adam Exp $
+ * $Id: zoom-c.c,v 1.35 2003-05-20 08:22:33 adam Exp $
*
* ZOOM layer for C, connections, result sets, queries.
*/
{
ZOOM_Event event = c->m_queue_front;
if (!event)
+ {
+ c->last_event = ZOOM_EVENT_NONE;
return 0;
+ }
assert (c->m_queue_back);
c->m_queue_front = event->prev;
if (c->m_queue_front)
addinfo2 ? addinfo2 : "");
}
+#if HAVE_XML2
static void set_HTTP_error (ZOOM_connection c, int error,
const char *addinfo, const char *addinfo2)
{
set_dset_error(c, error, "HTTP", addinfo, addinfo2);
}
+#endif
static void set_ZOOM_error (ZOOM_connection c, int error,
const char *addinfo)
switch (task->which)
{
case ZOOM_TASK_SEARCH:
+
ZOOM_resultset_destroy (task->u.search.resultset);
break;
case ZOOM_TASK_RETRIEVE:
r->setname = 0;
r->schema = 0;
r->count = 0;
+ r->step = 0;
r->record_cache = 0;
r->r_sort_spec = 0;
r->query = 0;
r->start = ZOOM_options_get_int(r->options, "start", 0);
r->count = ZOOM_options_get_int(r->options, "count", 0);
+ r->step = ZOOM_options_get_int(r->options, "step", 0);
r->piggyback = ZOOM_options_get_bool (r->options, "piggyback", 1);
cp = ZOOM_options_get (r->options, "setname");
if (cp)
return zoom_complete;
}
sr->u.request->startRecord = odr_intdup (c->odr_out, resultset->start + 1);
- sr->u.request->maximumRecords = odr_intdup (c->odr_out, resultset->count);
+ sr->u.request->maximumRecords = odr_intdup (
+ c->odr_out, resultset->step>0 ? resultset->step : resultset->count);
sr->u.request->recordSchema = resultset->schema;
recordPacking = ZOOM_resultset_option_get (resultset, "recordPacking");
/* Regular piggyback - do it unless we're going to do sort */
*search_req->largeSetLowerBound = 2000000000;
*search_req->smallSetUpperBound = 0;
- *search_req->mediumSetPresentNumber = r->count;
+ *search_req->mediumSetPresentNumber = r->step>0 ? r->step : r->count;
smallSetElementSetName = 0;
}
else
ZOOM_API(ZOOM_record)
ZOOM_resultset_record (ZOOM_resultset r, size_t pos)
{
- ZOOM_resultset_retrieve (r, 1, pos, 1);
- return ZOOM_resultset_record_immediate (r, pos);
+ ZOOM_record rec = ZOOM_resultset_record_immediate(r, pos);
+
+ if (!rec)
+ {
+ ZOOM_resultset_retrieve (r, 1, pos, 1);
+ rec = ZOOM_resultset_record_immediate (r, pos);
+ }
+ return rec;
}
ZOOM_API(void)
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);
+
for (rc = r->record_cache; rc; rc = rc->next)
{
if (pos == rc->pos)
static void handle_search_response (ZOOM_connection c, Z_SearchResponse *sr)
{
ZOOM_resultset resultset;
-
+ ZOOM_Event event;
+
yaz_log (LOG_DEBUG, "got search response");
-
+
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;
resultset->start += i;
resultset->count -= i;
*req->resultSetStartPoint = resultset->start + 1;
- *req->numberOfRecordsRequested = resultset->count;
+ *req->numberOfRecordsRequested = resultset->step>0 ?
+ resultset->step : resultset->count;
assert (*req->numberOfRecordsRequested > 0);
if (syntax && *syntax)
ZOOM_resultset resultset = 0;
int i;
NMEM nmem;
+ ZOOM_Event event;
if (!c->tasks)
return;
else
return ;
+ event = ZOOM_Event_create(ZOOM_EVENT_RECV_SEARCH);
+ ZOOM_connection_put_event(c, event);
+
resultset->size = 0;
yaz_log(LOG_DEBUG, "got SRW response OK");