X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=2f171b677054c7a50f75534850caa9ba71dfea64;hb=8c7689a9150ae2639201c726a010c9059055b9be;hp=6efd068b7a4c60c18aab95fc7b53794effccb4f0;hpb=1853168ac9b85627a95a8067ef5c6cdc9f82b16d;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 6efd068..2f171b6 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.c,v 1.87 2007-06-08 13:57:19 adam Exp $
+/* $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.
@@ -33,10 +33,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 void child_handler(void *data)
 {
-    yaz_log(YLOG_LOG, "child_handler");
-
     start_proxy();
-    //start_zproxy();
     init_settings();
 
     if (*global_parameters.settings_path_override)
@@ -50,24 +47,49 @@ void child_handler(void *data)
 
 
     pazpar2_event_loop();
+
 }
 
+static void show_version(void)
+{
+    char yaz_version_str[80];
+    printf("Pazpar2 " VERSION "\n");
+
+    yaz_version(yaz_version_str, 0);
+
+    printf("Configuration:");
+#if HAVE_ICU
+    printf(" icu:?");
+#endif
+    printf(" yaz:%s", yaz_version_str);
+    printf("\n");
+    exit(0);
+}            
+
 int main(int argc, char **argv)
 {
+    int daemon = 0;
     int ret;
+    int log_file_in_use = 0;
     char *arg;
-    const char *pidfile = "pazpar2.pid";
+    const char *pidfile = 0;
+    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:l:dX", argv, argc, &arg)) != -2)
+    while ((ret = options("dDf:h:l:p:t:u:VX", argv, argc, &arg)) != -2)
     {
 	switch (ret)
         {
+        case 'd':
+            global_parameters.dump_records = 1;
+            break;
+        case 'D':
+            daemon = 1;
+            break;
         case 'f':
             if (!read_config(arg))
                 exit(1);
@@ -75,39 +97,48 @@ int main(int argc, char **argv)
         case 'h':
             strcpy(global_parameters.listener_override, arg);
             break;
+        case 'l':
+            yaz_log_init_file(arg);
+            log_file_in_use = 1;
+            break;
         case 'p':
-            strcpy(global_parameters.proxy_override, arg);
+            pidfile = arg;
             break;
-/*        case 'z': */
-/*             strcpy(global_parameters.zproxy_override, arg); */
-/*             break; */
         case 't':
             strcpy(global_parameters.settings_path_override, arg);
-             break;
-        case 'd':
-            global_parameters.dump_records = 1;
             break;
-        case 'l':
-            yaz_log_init_file(arg);
+        case 'u':
+            uid = arg;
             break;
+        case 'V':
+            show_version();
         case 'X':
             global_parameters.debug_mode = 1;
             break;
         default:
             fprintf(stderr, "Usage: pazpar2\n"
+                    "    -d                      (show internal records)\n"
+                    "    -D                      Daemon mode (background)\n"
                     "    -f configfile\n"
                     "    -h [host:]port          (REST protocol listener)\n"
-                    "    -p hostname[:portno]    (HTTP proxy)\n"
-                    "    -z hostname[:portno]    (Z39.50 proxy)\n"
-                    "    -t settings\n"
-                    "    -d                      (show internal records)\n"
                     "    -l file                 log to file\n"
+                    "    -p pidfile              PID file\n"
+                    "    -t settings\n"
+                    "    -u uid\n"
+                    "    -V                      show version\n"
                     "    -X                      debug mode\n"
                 );
             exit(1);
 	}
     }
 
+    yaz_log(YLOG_LOG, "Pazpar2 %s started", VERSION);
+    if (daemon && !log_file_in_use)
+    {
+        yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon "
+                "mode");
+        exit(1);
+    }
     if (!config)
     {
         yaz_log(YLOG_FATAL, "Load config with -f");
@@ -116,8 +147,9 @@ int main(int argc, char **argv)
     global_parameters.server = config->servers;
 
     start_http_listener();
-    pazpar2_process(global_parameters.debug_mode, 0, child_handler, 0,
-                    pidfile, 0);
+    pazpar2_process(global_parameters.debug_mode, daemon,
+                    child_handler, 0 /* child_data */,
+                    pidfile, uid);
     return 0;
 }