and search result respectively.
Possible compatibility problems with earlier versions marked with '*'.
Possible compatibility problems with earlier versions marked with '*'.
+New ZOOM events ZOOM_EVENT_RECV_{RECORD,SEARCH} for receiving a record
+and search result respectively.
+
--- 2.0.1 2003/04/25
Redhat package is now several packages: libyaz (runtime libraries),
--- 2.0.1 2003/04/25
Redhat package is now several packages: libyaz (runtime libraries),
+yaz (2.0.1-2) unstable; urgency=low
+
+ * Event extensions.
+
+ -- Adam Dickmeiss <adam@indexdata.dk> Mon, 28 Apr 2003 12:22:50 +0100
+
yaz (2.0.1-1) unstable; urgency=low
* Upstream.
yaz (2.0.1-1) unstable; urgency=low
* Upstream.
/*
* Public header for ZOOM C.
/*
* Public header for ZOOM C.
- * $Id: zoom.h,v 1.17 2003-02-17 14:35:42 adam Exp $
+ * $Id: zoom.h,v 1.18 2003-04-28 11:04:52 adam Exp $
*/
#include <yaz/yconfig.h>
*/
#include <yaz/yconfig.h>
#define ZOOM_EVENT_UNKNOWN 5
#define ZOOM_EVENT_SEND_APDU 6
#define ZOOM_EVENT_RECV_APDU 7
#define ZOOM_EVENT_UNKNOWN 5
#define ZOOM_EVENT_SEND_APDU 6
#define ZOOM_EVENT_RECV_APDU 7
+#define ZOOM_EVENT_RECV_RECORD 8
+#define ZOOM_EVENT_RECV_SEARCH 9
/* ----------------------------------------------------------- */
/* result sets */
/* ----------------------------------------------------------- */
/* result sets */
* 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.31 2003-04-23 20:38:19 adam Exp $
+ * $Id: zoom-c.c,v 1.32 2003-04-28 11:04:52 adam Exp $
*
* ZOOM layer for C, connections, result sets, queries.
*/
*
* ZOOM layer for C, connections, result sets, queries.
*/
switch (task->which)
{
case ZOOM_TASK_SEARCH:
switch (task->which)
{
case ZOOM_TASK_SEARCH:
ZOOM_resultset_destroy (task->u.search.resultset);
break;
case ZOOM_TASK_RETRIEVE:
ZOOM_resultset_destroy (task->u.search.resultset);
break;
case ZOOM_TASK_RETRIEVE:
ZOOM_API(ZOOM_record)
ZOOM_resultset_record (ZOOM_resultset r, size_t pos)
{
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;
const char *syntax =
ZOOM_resultset_option_get (r, "preferredRecordSyntax");
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)
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;
static void handle_search_response (ZOOM_connection c, Z_SearchResponse *sr)
{
ZOOM_resultset resultset;
yaz_log (LOG_DEBUG, "got search response");
yaz_log (LOG_DEBUG, "got search response");
if (!c->tasks || c->tasks->which != ZOOM_TASK_SEARCH)
return ;
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 = c->tasks->u.search.resultset;
ZOOM_resultset resultset = 0;
int i;
NMEM nmem;
ZOOM_resultset resultset = 0;
int i;
NMEM nmem;
+ 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");
resultset->size = 0;
yaz_log(LOG_DEBUG, "got SRW response OK");