Incorporate Windos services (sc).

[pazpar2-moved-to-github.git] / src / pazpar2.c

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 2f171b6..371d6f5 100644 (file)
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,7 +1,5 @@
-/* $Id: pazpar2.c,v 1.93 2007-09-10 08:42:48 adam Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2008 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -14,15 +12,17 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+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>
@@ -30,6 +30,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "pazpar2.h"
 #include "database.h"
 #include "settings.h"
+#include <yaz/daemon.h>
+#include <yaz/sc.h>
 
 void child_handler(void *data)
 {
@@ -53,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);
 
@@ -66,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;
@@ -75,10 +91,18 @@ int main(int argc, char **argv)
     const char *pidfile = 0;
     const char *uid = 0;
 
+#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)
     {
@@ -146,14 +170,37 @@ int main(int argc, char **argv)
     }
     global_parameters.server = config->servers;
 
-    start_http_listener();
-    pazpar2_process(global_parameters.debug_mode, daemon,
-                    child_handler, 0 /* child_data */,
-                    pidfile, uid);
+    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,
+               child_handler, 0 /* child_data */,
+               pidfile, uid);
     return 0;
 }
 
 
+static void sc_stop(yaz_sc_t s)
+{
+
+}
+
+int main(int argc, char **argv)
+{
+    int ret;
+    yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar Metasearcher");
+
+    ret = yaz_sc_program(s, argc, argv, sc_main, sc_stop);
+
+    yaz_sc_destroy(&s);
+    exit(ret);
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4