X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=3f10faf0204a32ad2c7e0491ef02029071cb3040;hb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;hp=e3115d69352be3324159a9c6564567eb1330f137;hpb=0df6c383d656dba662eb9d9acafed01a0973fcff;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index e3115d6..3f10faf 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -1,10 +1,26 @@
 /*
- * Copyright (C) 1995-1998, Index Data 
+ * Copyright (C) 1995-1999, Index Data 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zserver.c,v $
- * Revision 1.63  1998-09-02 13:53:21  adam
+ * Revision 1.68  1999-05-26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.67  1999/02/02 14:51:14  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.66  1998/10/28 10:54:41  adam
+ * SDRKit integration.
+ *
+ * Revision 1.65  1998/10/18 07:54:54  adam
+ * Additional info added for diagnostics 114 (Unsupported use attribute) and
+ * 121 (Unsupported attribute set).
+ *
+ * Revision 1.64  1998/09/22 10:48:21  adam
+ * Minor changes in search API.
+ *
+ * Revision 1.63  1998/09/02 13:53:21  adam
  * Extra parameter decode added to search routines to implement
  * persistent queries.
  *
@@ -233,7 +249,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <fcntl.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #include <process.h>
 #else
@@ -245,11 +261,19 @@
 
 #include "zserver.h"
 
+#ifndef ZEBRASDR
+#define ZEBRASDR 0
+#endif
+#if ZEBRASDR
+#include "zebrasdr.h"
+#endif
+
 static int bend_sort (void *handle, bend_sort_rr *rr);
 
 bend_initresult *bend_init (bend_initrequest *q)
 {
-    bend_initresult *r = odr_malloc (q->stream, sizeof(*r));
+    bend_initresult *r = (bend_initresult *)
+	odr_malloc (q->stream, sizeof(*r));
     ZebraHandle zh;
     struct statserv_options_block *sob;
     char *user = NULL;
@@ -296,8 +320,9 @@ bend_initresult *bend_init (bend_initrequest *q)
 
 bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd)
 {
-    ZebraHandle zh = handle;
-    bend_searchresult *r = odr_malloc (q->stream, sizeof(*r));
+    ZebraHandle zh = (ZebraHandle) handle;
+    bend_searchresult *r = (bend_searchresult *)
+	odr_malloc (q->stream, sizeof(*r));
 
     r->hits = 0;
     r->errcode = 0;
@@ -307,12 +332,16 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd)
     switch (q->query->which)
     {
     case Z_Query_type_1: case Z_Query_type_101:
-	zebra_search_rpn (zh, q->stream, q->decode, q->query->u.type_1,
+	zebra_search_rpn (zh, q->decode, q->stream, q->query->u.type_1,
 			  q->num_bases, q->basenames, q->setname);
 	r->errcode = zh->errCode;
 	r->errstring = zh->errString;
 	r->hits = zh->hits;
         break;
+    case Z_Query_type_2:
+	r->errcode = 107;
+	r->errstring = "type-2";
+	break;
     default:
         r->errcode = 107;
     }
@@ -321,8 +350,9 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd)
 
 bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num)
 {
-    ZebraHandle zh = handle;
-    bend_fetchresult *r = odr_malloc (q->stream, sizeof(*r));
+    ZebraHandle zh = (ZebraHandle) handle;
+    bend_fetchresult *r = (bend_fetchresult *)
+	odr_malloc (q->stream, sizeof(*r));
     ZebraRetrievalRecord retrievalRecord;
 
     retrievalRecord.position = q->number;
@@ -356,14 +386,16 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num)
 bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num)
 {
     ZebraScanEntry *entries;
-    ZebraHandle zh = handle;
-    bend_scanresult *r = odr_malloc (q->stream, sizeof(*r));
+    ZebraHandle zh = (ZebraHandle) handle;
+    bend_scanresult *r = (bend_scanresult *)
+	odr_malloc (q->stream, sizeof(*r));
     int is_partial, i;
     
     r->term_position = q->term_position;
     r->num_entries = q->num_entries;
 
-    r->entries = odr_malloc (q->stream, sizeof(*r->entries) * q->num_entries);
+    r->entries = (struct scan_entry *)
+	odr_malloc (q->stream, sizeof(*r->entries) * q->num_entries);
     zebra_scan (zh, q->stream, q->term,
 		q->attributeset,
 		q->num_bases, q->basenames,
@@ -390,7 +422,7 @@ void bend_close (void *handle)
 
 int bend_sort (void *handle, bend_sort_rr *rr)
 {
-    ZebraHandle zh = handle;
+    ZebraHandle zh = (ZebraHandle) handle;
 
     zebra_sort (zh, rr->stream,
                 rr->num_input_setnames, (const char **) rr->input_setnames,
@@ -400,7 +432,7 @@ int bend_sort (void *handle, bend_sort_rr *rr)
     return 0;
 }
 
-#ifndef WINDOWS
+#ifndef WIN32
 static void pre_init (struct statserv_options_block *sob)
 {
     char *pidfile = "zebrasrv.pid";
@@ -425,10 +457,13 @@ int main (int argc, char **argv)
 
     sob = statserv_getcontrol ();
     strcpy (sob->configname, FNAME_CONFIG);
-#ifndef WINDOWS
+#ifndef WIN32
     sob->pre_init = pre_init;
 #endif
     statserv_setcontrol (sob);
 
+#if ZEBRASDR
+    zebraSdr_std ();
+#endif
     return statserv_main (argc, argv);
 }