X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=118887a3b7849d93a9360c66af542dc5b07b4695;hb=78f51742e3b066955a13167346413627be644643;hp=b499c2153deb170a553eb8d2e8d67c5192fc2811;hpb=2cb08a89ee65d8ae2646b91dcf27bc3883759691;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index b499c21..118887a 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,4 +1,4 @@ -/* $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 @@ -28,7 +28,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include -#else +#endif +#if HAVE_UNISTD_H #include #endif @@ -213,7 +214,8 @@ static void search_terms(ZebraHandle zh, bend_search_rr *r) 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; @@ -309,7 +311,7 @@ int bend_fetch (void *handle, bend_fetch_rr *r) 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 */ @@ -357,7 +359,8 @@ static int bend_scan (void *handle, bend_scan_rr *r) 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) @@ -647,9 +650,10 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) { 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) { @@ -670,7 +674,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) &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) @@ -688,7 +692,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) &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) @@ -705,7 +709,7 @@ int bend_esrequest (void *handle, bend_esrequest_rr *rr) &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)