Fixed bug #1187: command=show crashes if used before a search is

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

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 117464c..e3d6627 100644 (file)
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.c,v 1.85 2007-05-23 21:58:28 adam Exp $
+/* $Id: pazpar2.c,v 1.89 2007-06-12 13:02:38 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -31,17 +31,38 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "database.h"
 #include "settings.h"
 
+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);
+
+
+    pazpar2_event_loop();
+
+}
+
 int main(int argc, char **argv)
 {
     int ret;
     char *arg;
+    const char *pidfile = "pazpar2.pid";
+    const char *uid = 0;
 
     if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
         yaz_log(YLOG_WARN|YLOG_ERRNO, "signal");
 
     yaz_log_init_prefix("pazpar2");
 
-    while ((ret = options("f:h:p:z:t:l:dX", argv, argc, &arg)) != -2)
+    while ((ret = options("f:h:p:t:u:l:dX", argv, argc, &arg)) != -2)
     {
        switch (ret)
         {
@@ -53,14 +74,14 @@ int main(int argc, char **argv)
             strcpy(global_parameters.listener_override, arg);
             break;
         case 'p':
-            strcpy(global_parameters.proxy_override, arg);
-            break;
-        case 'z':
-            strcpy(global_parameters.zproxy_override, arg);
+            pidfile = arg;
             break;
         case 't':
             strcpy(global_parameters.settings_path_override, arg);
-             break;
+            break;
+        case 'u':
+            uid = arg;
+            break;
         case 'd':
             global_parameters.dump_records = 1;
             break;
@@ -74,9 +95,9 @@ int main(int argc, char **argv)
             fprintf(stderr, "Usage: pazpar2\n"
                     "    -f configfile\n"
                     "    -h [host:]port          (REST protocol listener)\n"
-                    "    -p hostname[:portno]    (HTTP proxy)\n"
-                    "    -z hostname[:portno]    (Z39.50 proxy)\n"
+                    "    -p pidfile              PID file\n"
                     "    -t settings\n"
+                    "    -u uid\n"
                     "    -d                      (show internal records)\n"
                     "    -l file                 log to file\n"
                     "    -X                      debug mode\n"
@@ -93,21 +114,9 @@ int main(int argc, char **argv)
     global_parameters.server = config->servers;
 
     start_http_listener();
-    start_proxy();
-    start_zproxy();
-    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);
-
-    pazpar2_event_loop();
-
+    pazpar2_process(global_parameters.debug_mode,
+                    child_handler, 0 /* child_data */,
+                    pidfile, uid);
     return 0;
 }