X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=ztest%2Fztest.c;h=ee1b4a2d21fbc94f0f041798a75622956b363d63;hp=d8b155541edca72c53e8c18c590ffafdb53c31f8;hb=6a7d650e44134d161a4614a5e68245216dec2b19;hpb=6517fa53d35512887780fd07de5667940da18a9e

diff --git a/ztest/ztest.c b/ztest/ztest.c
index d8b1555..ee1b4a2 100644
--- 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,14 @@
  *    Chas Woodfield, Fretwell Downing Datasystems.
  *
  * $Log: ztest.c,v $
- * Revision 1.4  1997-09-17 12:10:43  adam
+ * 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
@@ -33,11 +40,16 @@
 #include <xmalloc.h>
 #include <proto.h>
 
-/* Specifically for NT Services - Shouldn't cause problems on UNIX */
-#include "service.h"
-
 Z_GenericRecord *read_grs1(FILE *f, ODR o);
 
+int bend_sort (void *handle, bend_sortrequest *req, bend_sortresult *res)
+{
+    res->errcode = 1;
+    res->errstring = "Sort not implemented";
+    res->sort_status = Z_SortStatus_failure;
+    return 0;
+}
+
 bend_initresult *bend_init(bend_initrequest *q)
 {
     bend_initresult *r = odr_malloc (q->stream, sizeof(*r));
@@ -46,6 +58,7 @@ bend_initresult *bend_init(bend_initrequest *q)
     r->errcode = 0;
     r->errstring = 0;
     r->handle = dummy;
+    q->bend_sort = bend_sort;    /* register sort handler */
     return r;
 }
 
@@ -301,65 +314,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);
+    return statserv_main(argc, argv);
 }
-#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);
-}
-
-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