X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=3e8ebaf7de9345d4f81addd01fb6642ce9b8c74d;hb=8cf288df88e558c157db98fb641e1961510417a3;hp=f51fa9e10a68ab2151b36ac3938370d82e6adab9;hpb=3e59f10fe3e32e6e632b46a1118e8a06c2b722a9;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.c b/src/pazpar2.c
index f51fa9e..3e8ebaf 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2011 Index Data
+   Copyright (C) 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
@@ -22,6 +22,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 #ifdef WIN32
 #include <winsock.h>
+#include <direct.h>
+#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
 #endif
 
 #include <signal.h>
@@ -54,7 +58,7 @@ void child_handler(void *data)
 static void show_version(void)
 {
     char yaz_version_str[80];
-    printf("Pazpar2 " PACKAGE_VERSION 
+    printf("Pazpar2 " PACKAGE_VERSION
 #ifdef PAZPAR2_VERSION_SHA1
            " "
            PAZPAR2_VERSION_SHA1
@@ -72,7 +76,7 @@ static void show_version(void)
     printf(" yaz:%s", yaz_version_str);
     printf("\n");
     exit(0);
-}            
+}
 
 #ifdef WIN32
 static int tcpip_init (void)
@@ -89,7 +93,7 @@ static int tcpip_init (void)
 
 
 static int sc_main(
-    yaz_sc_t s, 
+    yaz_sc_t s,
     int argc, char **argv)
 {
     int daemon = 0;
@@ -104,6 +108,9 @@ static int sc_main(
     struct conf_config *config = 0;
     int test_mode = 0;
 
+    xmlInitParser();
+    LIBXML_TEST_VERSION
+
 #ifndef WIN32
     if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
         yaz_log(YLOG_WARN|YLOG_ERRNO, "signal");
@@ -114,12 +121,12 @@ static int sc_main(
     yaz_log_init_prefix("pazpar2");
     yaz_log_xml_errors(0, YLOG_WARN);
 
-    while ((ret = options("dDf:h:l:p:R:tu:v:VX", argv, argc, &arg)) != -2)
+    while ((ret = options("dDf:h:l:m:p:R:tu:v:Vw:X", argv, argc, &arg)) != -2)
     {
 	switch (ret)
         {
         case 'd':
-            global_parameters.dump_records = 1;
+            global_parameters.dump_records++;
             break;
         case 'D':
             daemon = 1;
@@ -134,6 +141,9 @@ static int sc_main(
             yaz_log_init_file(arg);
             log_file_in_use = 1;
             break;
+        case 'm':
+            yaz_log_time_format(arg);
+            break;
         case 'p':
             pidfile = arg;
             break;
@@ -154,7 +164,13 @@ static int sc_main(
             show_version();
             break;
         case 'w':
-            if (chdir(arg))
+            if (
+#ifdef WIN32
+              _chdir
+#else
+              chdir
+#endif
+                (arg))
             {
                 yaz_log(YLOG_FATAL|YLOG_ERRNO, "chdir %s", arg);
                 return 1;
@@ -171,6 +187,7 @@ static int sc_main(
                     "    -f configfile           Configuration\n"
                     "    -h [host:]port          Listener port\n"
                     "    -l file                 Log to file\n"
+                    "    -m logformat            log time format (strftime)\n"
                     "    -p pidfile              PID file\n"
                     "    -R recfile              HTTP recording file\n"
                     "    -t                      Test configuration\n"
@@ -193,8 +210,18 @@ static int sc_main(
         return 1;
     }
     pazpar2_mutex_init();
-    
-    config = config_create(config_fname, global_parameters.dump_records);
+
+    if (!test_mode)
+    {
+        yaz_log(YLOG_LOG, "Pazpar2 start " VERSION " "
+#ifdef PAZPAR2_VERSION_SHA1
+                PAZPAR2_VERSION_SHA1
+#else
+                "-"
+#endif
+            );
+    }
+    config = config_create(config_fname);
     if (!config)
         return 1;
     sc_stop_config = config;
@@ -205,30 +232,27 @@ static int sc_main(
     }
     else
     {
-        yaz_log(YLOG_LOG, "Pazpar2 " VERSION  " "
-#ifdef PAZPAR2_VERSION_SHA1
-                PAZPAR2_VERSION_SHA1
-#else
-                "-"
-#endif
-                " started");
+        ret = 0;
         if (daemon && !log_file_in_use)
         {
             yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon "
                     "mode");
-            return 1;
+            ret = 1;
         }
-        ret = config_start_listeners(config, listener_override, record_fname);
-        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, config /* child_data */,
-                   pidfile, uid);
+        if (!ret)
+            ret = config_start_listeners(config, listener_override,
+                                         record_fname);
+        if (!ret)
+        {
+            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, config /* child_data */,
+                       pidfile, uid);
+        }
+        yaz_log(YLOG_LOG, "Pazpar2 stop");
+        return ret;
     }
     return 0;
 }
@@ -243,7 +267,7 @@ int main(int argc, char **argv)
 {
     int ret;
     yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar2");
-    
+
 #ifdef MTRACE
     mtrace();
 #endif