-/* $Id: zserver.c,v 1.134 2005-05-24 11:35:42 adam Exp $
+/* $Id: zserver.c,v 1.139 2005-08-22 09:04:18 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
#include <io.h>
#include <process.h>
#include <sys/locking.h>
-#else
+#endif
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
size_t len = sizeof(outbuf);
zebra_result_set_term_info(zh, r->setname, i,
- &count, &approx, outbuf, &len);
+ &count, &approx, outbuf, &len,
+ 0 /* term_ref_id */ );
sr->elements[i] = odr_malloc (r->stream, sizeof(**sr->elements));
sr->elements[i]->subqueryId = 0;
r->last_in_set = 0;
res = zebra_records_retrieve (zh, r->stream, r->setname, r->comp,
- r->request_format, 1, &retrievalRecord);
+ r->request_format, 1, &retrievalRecord);
if (res != ZEBRA_OK)
{
/* non-surrogate diagnostic */
res = zebra_scan(zh, r->stream, r->term,
r->attributeset,
&r->term_position,
- &r->num_entries, &entries, &is_partial);
+ &r->num_entries, &entries, &is_partial,
+ 0 /* setname */);
if (res == ZEBRA_OK)
{
if (is_partial)
{
int r = zebra_admin_exchange_record (
zh,
- rec->u.octet_aligned->buf,
+ (const char *) rec->u.octet_aligned->buf,
rec->u.octet_aligned->len,
- opaque_recid->buf, opaque_recid->len,
+ (const char *) opaque_recid->buf,
+ opaque_recid->len,
action);
if (r)
{
&sysno,
0, /* match */
0, /* fname */
- rec->u.octet_aligned->buf,
+ (const char *) rec->u.octet_aligned->buf,
rec->u.octet_aligned->len,
0);
if (r == ZEBRA_FAIL)
&sysno,
0, /* match */
0, /* fname */
- rec->u.octet_aligned->buf,
+ (const char *) rec->u.octet_aligned->buf,
rec->u.octet_aligned->len,
1);
if (r == ZEBRA_FAIL)
&sysno,
0, /* match */
0, /* fname */
- rec->u.octet_aligned->buf,
+ (const char *) rec->u.octet_aligned->buf,
rec->u.octet_aligned->len,
0);
if (r == ZEBRA_FAIL)