X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2.c;h=e3ab4d7ed0708c4f572468d4e131c37e8b255d7f;hb=fefe2e7a551449db560de9c59c29ce16dff22e86;hp=84c6d5e5e1a5662d8a9aac932d62862035ed2471;hpb=e107b0011a295ccc61502d6e5ea79d9125a3fbb4;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 84c6d5e..e3ab4d7 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -18,9 +18,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #if HAVE_CONFIG_H
-#include "cconfig.h"
+#include <config.h>
+#endif
+#ifdef WIN32
+#include <winsock.h>
 #endif
-
 
 #include <signal.h>
 #include <assert.h>
@@ -29,6 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "database.h"
 #include "settings.h"
 #include <yaz/daemon.h>
+#include <yaz/sc.h>
 
 void child_handler(void *data)
 {
@@ -52,7 +55,7 @@ void child_handler(void *data)
 static void show_version(void)
 {
     char yaz_version_str[80];
-    printf("Pazpar2 " VERSION "\n");
+    printf("Pazpar2 " PACKAGE_VERSION "\n");
 
     yaz_version(yaz_version_str, 0);
 
@@ -65,7 +68,21 @@ static void show_version(void)
     exit(0);
 }            
 
-int main(int argc, char **argv)
+#ifdef WIN32
+static int tcpip_init (void)
+{
+    WORD requested;
+    WSADATA wd;
+
+    requested = MAKEWORD(1, 1);
+    if (WSAStartup(requested, &wd))
+        return 0;
+    return 1;
+}
+#endif
+
+
+static int sc_main(yaz_sc_t s, int argc, char **argv)
 {
     int daemon = 0;
     int ret;
@@ -73,15 +90,23 @@ int main(int argc, char **argv)
     char *arg;
     const char *pidfile = 0;
     const char *uid = 0;
+    int i;
 
+    for (i = 0; i < argc; i++)
+        yaz_log(YLOG_LOG, "arg%d: %s", i, argv[i]);
+#ifndef WIN32
     if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
         yaz_log(YLOG_WARN|YLOG_ERRNO, "signal");
+#else
+    tcpip_init();
+#endif
 
     yaz_log_init_prefix("pazpar2");
 #if YAZ_VERSIONL >= 0x03001B
     yaz_log_xml_errors(0, YLOG_WARN);
 #endif
 
+
     while ((ret = options("dDf:h:l:p:t:u:VX", argv, argc, &arg)) != -2)
     {
 	switch (ret)
@@ -130,7 +155,7 @@ int main(int argc, char **argv)
                     "    -V                      show version\n"
                     "    -X                      debug mode\n"
                 );
-            exit(1);
+            return 1;
 	}
     }
 
@@ -139,16 +164,21 @@ int main(int argc, char **argv)
     {
         yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon "
                 "mode");
-        exit(1);
+        return 1;
     }
     if (!config)
     {
         yaz_log(YLOG_FATAL, "Load config with -f");
-        exit(1);
+        return 1;
     }
     global_parameters.server = config->servers;
 
-    start_http_listener();
+    ret = start_http_listener();
+    if (ret)
+        return ret; /* error starting http listener */
+
+    yaz_sc_running(s);
+
     yaz_daemon("pazpar2",
                (global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
                (daemon ? YAZ_DAEMON_FORK : 0) + YAZ_DAEMON_KEEPALIVE,
@@ -158,6 +188,22 @@ int main(int argc, char **argv)
 }
 
 
+static void sc_stop(yaz_sc_t s)
+{
+    http_close_server();
+}
+
+int main(int argc, char **argv)
+{
+    int ret;
+    yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar2");
+
+    ret = yaz_sc_program(s, argc, argv, sc_main, sc_stop);
+
+    yaz_sc_destroy(&s);
+    exit(ret);
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4