X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=56d25990b5f5cdcfdf626ac9861983a4d90a2fc4;hb=5b4ea0cf66dd82c871ed7d69a5801d78789087b2;hp=25674e79946b316284c23973cd90f84bd24fbee3;hpb=caccd7d8b406e79df7e43a0e37dd3ba363094c1a;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 25674e7..56d2599 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2008 Index Data
+   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
@@ -32,42 +32,33 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "settings.h"
 #include <yaz/daemon.h>
 
-#if YAZ_VERSIONL >= 0x03001D
-/* Windows service is available in YAZ 3.0.29 or later */
-#define USE_SC 1
 #include <yaz/sc.h>
-#else
-#define USE_SC 0
-#endif
+
+static char *path_override = 0;
+static struct conf_config *sc_stop_config = 0;
 
 void child_handler(void *data)
 {
-    start_proxy();
-    init_settings();
-
-    if (*global_parameters.settings_path_override)
-        settings_read(global_parameters.settings_path_override);
-    else if (global_parameters.server->settings)
-        settings_read(global_parameters.server->settings);
-    else
-        yaz_log(YLOG_WARN, "No settings-directory specified");
-    global_parameters.odr_in = odr_createmem(ODR_DECODE);
-    global_parameters.odr_out = odr_createmem(ODR_ENCODE);
-
+    struct conf_config *config = (struct conf_config *) data;
+    config_read_settings(config, path_override);
 
     pazpar2_event_loop();
-
 }
 
 static void show_version(void)
 {
     char yaz_version_str[80];
-    printf("Pazpar2 " PACKAGE_VERSION "\n");
+    printf("Pazpar2 " PACKAGE_VERSION 
+#ifdef PAZPAR2_VERSION_SHA1
+           " "
+           PAZPAR2_VERSION_SHA1
+#endif
+"\n");
 
     yaz_version(yaz_version_str, 0);
 
     printf("Configuration:");
-#if HAVE_ICU
+#if YAZ_HAVE_ICU
     printf(" icu:?");
 #endif
     printf(" yaz:%s", yaz_version_str);
@@ -90,9 +81,7 @@ static int tcpip_init (void)
 
 
 static int sc_main(
-#if USE_SC
     yaz_sc_t s, 
-#endif
     int argc, char **argv)
 {
     int daemon = 0;
@@ -101,10 +90,11 @@ static int sc_main(
     char *arg;
     const char *pidfile = 0;
     const char *uid = 0;
-    int i;
+    int session_timeout = 60;
+    const char *listener_override = 0;
+    const char *proxy_override = 0;
+    struct conf_config *config = 0;
 
-    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");
@@ -113,12 +103,9 @@ static int sc_main(
 #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)
+    while ((ret = options("dDf:h:l:p:t:T:u:VX", argv, argc, &arg)) != -2)
     {
 	switch (ret)
         {
@@ -129,11 +116,13 @@ static int sc_main(
             daemon = 1;
             break;
         case 'f':
-            if (!read_config(arg))
-                exit(1);
+            config = config_create(arg);
+            if (!config)
+                return 1;
+            sc_stop_config = config;
             break;
         case 'h':
-            strcpy(global_parameters.listener_override, arg);
+            listener_override = arg;
             break;
         case 'l':
             yaz_log_init_file(arg);
@@ -143,7 +132,17 @@ static int sc_main(
             pidfile = arg;
             break;
         case 't':
-            strcpy(global_parameters.settings_path_override, arg);
+            path_override = arg;
+            break;
+        case 'T':
+	    session_timeout = atoi(arg);
+	    if (session_timeout < 9 || session_timeout > 86400)
+            {
+                yaz_log(YLOG_FATAL, "Session timeout out of range 10..86400: %d",
+                        session_timeout);
+                return 1;
+            }
+            global_parameters.session_timeout = session_timeout;
             break;
         case 'u':
             uid = arg;
@@ -162,9 +161,14 @@ static int sc_main(
                     "    -l file                 log to file\n"
                     "    -p pidfile              PID file\n"
                     "    -t settings\n"
+                    "    -T session_timeout\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
                 );
             return 1;
 	}
@@ -182,51 +186,43 @@ static int sc_main(
         yaz_log(YLOG_FATAL, "Load config with -f");
         return 1;
     }
-    global_parameters.server = config->servers;
-
-    ret = start_http_listener();
+    ret = config_start_listeners(config, listener_override, proxy_override);
     if (ret)
         return ret; /* error starting http listener */
 
-#if USE_SC
     yaz_sc_running(s);
-#endif
 
     yaz_daemon("pazpar2",
                (global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
                (daemon ? YAZ_DAEMON_FORK : 0) + YAZ_DAEMON_KEEPALIVE,
-               child_handler, 0 /* child_data */,
+               child_handler, config /* child_data */,
                pidfile, uid);
     return 0;
 }
 
 
-#if USE_SC
 static void sc_stop(yaz_sc_t s)
 {
-    http_close_server();
+    config_stop_listeners(sc_stop_config);
 }
-#endif
 
 int main(int argc, char **argv)
 {
     int ret;
-#if USE_SC
     yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar2");
 
     ret = yaz_sc_program(s, argc, argv, sc_main, sc_stop);
 
     yaz_sc_destroy(&s);
-#else
-    ret = sc_main(argc, argv);
-#endif
     exit(ret);
 }
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+