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
ZOOM option: step. More verbose GFS SRW server display
[yaz-moved-to-github.git]
/
zutil
/
zoom-c.c
diff --git
a/zutil/zoom-c.c
b/zutil/zoom-c.c
index
b2bfeea
..
578c57f
100644
(file)
--- a/
zutil/zoom-c.c
+++ b/
zutil/zoom-c.c
@@
-2,7
+2,7
@@
* Copyright (c) 2000-2003, Index Data
* See the file LICENSE for details.
*
* Copyright (c) 2000-2003, Index Data
* See the file LICENSE for details.
*
- * $Id: zoom-c.c,v 1.33 2003-04-29 21:20:34 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 layer for C, connections, result sets, queries.
*/
@@
-68,7
+68,10
@@
static ZOOM_Event ZOOM_connection_get_event(ZOOM_connection c)
{
ZOOM_Event event = c->m_queue_front;
if (!event)
{
ZOOM_Event event = c->m_queue_front;
if (!event)
+ {
+ c->last_event = ZOOM_EVENT_NONE;
return 0;
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 = event->prev;
if (c->m_queue_front)
@@
-505,6
+508,7
@@
ZOOM_resultset ZOOM_resultset_create ()
r->setname = 0;
r->schema = 0;
r->count = 0;
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->record_cache = 0;
r->r_sort_spec = 0;
r->query = 0;
@@
-540,6
+544,7
@@
ZOOM_connection_search(ZOOM_connection c, ZOOM_query q)
r->start = ZOOM_options_get_int(r->options, "start", 0);
r->count = ZOOM_options_get_int(r->options, "count", 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)
r->piggyback = ZOOM_options_get_bool (r->options, "piggyback", 1);
cp = ZOOM_options_get (r->options, "setname");
if (cp)
@@
-1114,7
+1119,8
@@
static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c)
return zoom_complete;
}
sr->u.request->startRecord = odr_intdup (c->odr_out, resultset->start + 1);
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");
sr->u.request->recordSchema = resultset->schema;
recordPacking = ZOOM_resultset_option_get (resultset, "recordPacking");
@@
-1188,7
+1194,7
@@
static zoom_ret ZOOM_connection_send_search (ZOOM_connection c)
/* Regular piggyback - do it unless we're going to do sort */
*search_req->largeSetLowerBound = 2000000000;
*search_req->smallSetUpperBound = 0;
/* 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
smallSetElementSetName = 0;
}
else
@@
-1811,7
+1817,8
@@
static zoom_ret send_present (ZOOM_connection c)
resultset->start += i;
resultset->count -= i;
*req->resultSetStartPoint = resultset->start + 1;
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)
assert (*req->numberOfRecordsRequested > 0);
if (syntax && *syntax)