More work on SDRKit integration.

[idzebra-moved-to-github.git] / index / zserver.c

diff --git a/index/zserver.c b/index/zserver.c
index 52ba4f5..85ff5d9 100644 (file)
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -1,10 +1,20 @@
 /*
- * 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.64  1998-09-22 10:48:21  adam
+ * 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
@@ -236,7 +246,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <fcntl.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #include <process.h>
 #else
@@ -248,6 +258,13 @@
 
 #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)
@@ -316,6 +333,10 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd)
        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;
     }
@@ -403,7 +424,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";
@@ -428,10 +449,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);
 }