Added support for extended handlers in backend server interface.

[yaz-moved-to-github.git] / ztest / ztest.c

diff --git a/ztest/ztest.c b/ztest/ztest.c
index d8b1555..01f046b 100644 (file)
--- a/ztest/ztest.c
+++ b/ztest/ztest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
@@ -7,7 +7,17 @@
  *    Chas Woodfield, Fretwell Downing Datasystems.
  *
  * $Log: ztest.c,v $
- * Revision 1.4  1997-09-17 12:10:43  adam
+ * Revision 1.7  1998-02-10 11:03:57  adam
+ * Added support for extended handlers in backend server interface.
+ *
+ * Revision 1.6  1998/01/29 13:16:02  adam
+ * Added dummy sort in test server.
+ *
+ * Revision 1.5  1997/11/07 13:31:58  adam
+ * Added NT Service name part of statserv_options_block. Moved NT
+ * service utility to server library.
+ *
+ * Revision 1.4  1997/09/17 12:10:43  adam
  * YAZ version 1.4.
  *
  * Revision 1.3  1997/09/09 10:10:20  adam
@@ -32,12 +42,14 @@
 #include <backend.h>
 #include <xmalloc.h>
 #include <proto.h>
-
-/* Specifically for NT Services - Shouldn't cause problems on UNIX */
-#include "service.h"
+#include <log.h>
 
 Z_GenericRecord *read_grs1(FILE *f, ODR o);
 
+int ztest_search (void *handle, bend_search_rr *rr);
+int ztest_sort (void *handle, bend_sort_rr *rr);
+int ztest_present (void *handle, bend_present_rr *rr);
+
 bend_initresult *bend_init(bend_initrequest *q)
 {
     bend_initresult *r = odr_malloc (q->stream, sizeof(*r));
@@ -46,18 +58,35 @@ bend_initresult *bend_init(bend_initrequest *q)
     r->errcode = 0;
     r->errstring = 0;
     r->handle = dummy;
+    q->bend_sort = ztest_sort;       /* register sort handler */
+    q->bend_search = ztest_search;   /* register search handler */
+    q->bend_present = ztest_present; /* register present handle */
     return r;
 }
 
-bend_searchresult *bend_search(void *handle, bend_searchrequest *q, int *fd)
+int ztest_search (void *handle, bend_search_rr *rr)
 {
-    bend_searchresult *r = odr_malloc (q->stream, sizeof(*r));
+    rr->hits = rand() % 22;
+    return 0;
+}
 
-    r->errcode = 0;
-    r->errstring = 0;
-    r->hits = rand() % 22;
+int ztest_present (void *handle, bend_present_rr *rr)
+{
+    return 0;
+}
 
-    return r;
+/* Obsolete bend_search, never called because handler is registered */
+bend_searchresult *bend_search(void *handle, bend_searchrequest *q, int *fd)
+{
+    return 0;
+}
+
+/* Our sort handler really doesn't sort... */
+int ztest_sort (void *handle, bend_sort_rr *rr)
+{
+    rr->errcode = 0;
+    rr->sort_status = Z_SortStatus_success;
+    return 0;
 }
 
 static int atoin (const char *buf, int n)
@@ -228,6 +257,7 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num)
     char term[80], *p;
     int i, pos;
 
+    r->errcode = 0;
     r->errstring = 0;
     r->entries = list;
     r->status = BEND_SCAN_SUCCESS;
@@ -257,7 +287,7 @@ bend_scanresult *bend_scan(void *handle, bend_scanrequest *q, int *num)
        if (islower(*p))
            *p = toupper(*p);
 
-    fseek(f, 0, 0);
+    fseek(f, 0, SEEK_SET);
     r->num_entries = 0;
     for (i = 0, pos = 0; fscanf(f, " %79[^:]:%d", entries[pos], &hits[pos]) == 2;
        i++, pos < 199 ? pos++ : (pos = 0))
@@ -301,65 +331,7 @@ void bend_close(void *handle)
     return;
 }
 
-#ifndef WINDOWS
-/* UNIX version */
-int main(int argc, char **argv)
-{
-    statserv_main(argc, argv);
-    statserv_closedown();
-    exit (0);
-}
-#else
-/* Windows version with Service support */
-
-typedef struct _Args
-{
-    char **argv;
-    int argc;
-} Args; 
-
-static Args ArgDetails;
-
-/* name of the executable */
-#define SZAPPNAME            "server"
-
-/* internal name of the service */
-#define SZSERVICENAME        "Z3950 Test Server"
-
-/* displayed name of the service */
-#define SZSERVICEDISPLAYNAME "Z3950 Test Server"
-
-/* list of service dependencies - "dep1\0dep2\0\0" */
-#define SZDEPENDENCIES       ""
-
 int main(int argc, char **argv)
 {
-    /* Lets setup the Arg structure */
-    ArgDetails.argc = argc;
-    ArgDetails.argv = argv;
-
-    /* Now setup the service with the service controller */
-    SetupService(argc, argv, &ArgDetails, SZAPPNAME, SZSERVICENAME, SZSERVICEDISPLAYNAME, SZDEPENDENCIES);
-    return(0);
+    return statserv_main(argc, argv);
 }
-
-int StartAppService(void *pHandle, int argc, char **argv)
-{
-    /* Initializes the App */
-    return 1;
-}
-
-void RunAppService(void *pHandle)
-{
-    Args *pArgs = (Args *)pHandle;
-
-    /* Starts the app running */
-    statserv_main(pArgs->argc, pArgs->argv);
-}
-
-void StopAppService(void *pHandle)
-{
-    /* Stops the app */
-    statserv_closedown();
-}
-#endif