Missing metadata elements added

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

diff --git a/src/pazpar2.c b/src/pazpar2.c
index fcbbca2..b580120 100644 (file)
--- 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) 2006-2013 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;
@@ -114,12 +118,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: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;
@@ -152,6 +156,20 @@ static int sc_main(
             break;
         case 'V':
             show_version();
+            break;
+        case 'w':
+            if (
+#ifdef WIN32
+              _chdir
+#else
+              chdir
+#endif
+                (arg))
+            {
+                yaz_log(YLOG_FATAL|YLOG_ERRNO, "chdir %s", arg);
+                return 1;
+            }
+            break;
         case 'X':
             global_parameters.debug_mode++;
             global_parameters.predictable_sessions = 1;
@@ -169,6 +187,7 @@ static int sc_main(
                     "    -u uid                  Change user to uid\n"
                     "    -V                      Show version\n"
                     "    -v level                Set log level\n"
+                    "    -w dir                  Working directory\n"
                     "    -X                      Debug mode\n"
 #ifdef WIN32
                     "    -install                Install windows service\n"
@@ -184,7 +203,7 @@ static int sc_main(
         return 1;
     }
     pazpar2_mutex_init();
-    
+
     config = config_create(config_fname, global_parameters.dump_records);
     if (!config)
         return 1;
@@ -212,9 +231,9 @@ static int sc_main(
         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,
@@ -234,7 +253,7 @@ int main(int argc, char **argv)
 {
     int ret;
     yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar2");
-    
+
 #ifdef MTRACE
     mtrace();
 #endif