X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=6b387b7883482bf6b5dc52898c1e0e182dbefb80;hb=2628f9508a3b56be7071f2db91f9f4fd1f6f2d52;hp=bc87e4c89400263108a968043bd3076a4193cbcc;hpb=04864c49bf43ed46f71e0a6e452d56fe76fdfce1;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.c b/src/pazpar2.c
index bc87e4c..6b387b7 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,7 +1,5 @@
-/* $Id: pazpar2.c,v 1.92 2007-07-10 09:19:32 adam Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2009 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,9 @@ 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)
 {
@@ -50,7 +53,44 @@ void child_handler(void *data)
 
 }
 
-int main(int argc, char **argv)
+static void show_version(void)
+{
+    char yaz_version_str[80];
+    printf("Pazpar2 " PACKAGE_VERSION 
+#ifdef PAZPAR2_VERSION_SHA1
+           " "
+           PAZPAR2_VERSION_SHA1
+#endif
+"\n");
+
+    yaz_version(yaz_version_str, 0);
+
+    printf("Configuration:");
+#if YAZ_HAVE_ICU
+    printf(" icu:?");
+#endif
+    printf(" yaz:%s", yaz_version_str);
+    printf("\n");
+    exit(0);
+}            
+
+#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;
@@ -59,12 +99,17 @@ 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");
+    yaz_log_xml_errors(0, YLOG_WARN);
 
-    while ((ret = options("dDf:h:l:p:t:u:X", argv, argc, &arg)) != -2)
+    while ((ret = options("dDf:h:l:p:t:u:VX", argv, argc, &arg)) != -2)
     {
 	switch (ret)
         {
@@ -94,6 +139,8 @@ int main(int argc, char **argv)
         case 'u':
             uid = arg;
             break;
+        case 'V':
+            show_version();
         case 'X':
             global_parameters.debug_mode = 1;
             break;
@@ -107,9 +154,14 @@ int main(int argc, char **argv)
                     "    -p pidfile              PID file\n"
                     "    -t settings\n"
                     "    -u uid\n"
+                    "    -V                      show version\n"
                     "    -X                      debug mode\n"
+#ifdef WIN32
+                    "    -install                install windows service\n"
+                    "    -remove                 remove windows service\n"
+#endif
                 );
-            exit(1);
+            return 1;
 	}
     }
 
@@ -118,27 +170,52 @@ 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();
-    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)
+{
+    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
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+