X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=f1c92c4c241a356180c2367d776442d7f5488408;hb=7f02bad575a64004a3a0122a99666afd41dd8966;hp=e2ec1b34b3c00f844ba2c24434cb3bb81b27e6a7;hpb=9eaad46fe45a09ea35d9ce6561748145ebd52838;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index e2ec1b3..f1c92c4 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -1,4 +1,4 @@
-/* $Id: zserver.c,v 1.135 2005-06-13 10:29:20 adam Exp $
+/* $Id: zserver.c,v 1.140 2005-09-13 11:51:06 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -28,7 +28,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <io.h>
 #include <process.h>
 #include <sys/locking.h>
-#else
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
@@ -75,7 +76,7 @@ bend_initresult *bend_init (bend_initrequest *q)
     yaz_log (YLOG_DEBUG, "bend_init");
 
     sob = statserv_getcontrol ();
-    if (!(zh = zebra_open (sob->handle)))
+    if (!(zh = zebra_open (sob->handle, 0)))
     {
 	yaz_log (YLOG_WARN, "Failed to read config `%s'", sob->configname);
 	r->errcode = YAZ_BIB1_PERMANENT_SYSTEM_ERROR;
@@ -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;
@@ -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)