From a745f0041d5e495db155d4c43883f80b0c613d7e Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 10 Sep 2009 11:19:37 +0200
Subject: [PATCH] Remove support for option -t.

Option -t allows a settings file to be given on the command line.
This patch removes that facility. It is a rarely used facility.
---
 doc/pazpar2.xml      |   11 -----------
 src/pazpar2.c        |    9 ++-------
 src/pazpar2_config.c |    7 ++-----
 src/pazpar2_config.h |    3 +--
 4 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/doc/pazpar2.xml b/doc/pazpar2.xml
index 54f92b4..072c677 100644
--- a/doc/pazpar2.xml
+++ b/doc/pazpar2.xml
@@ -32,7 +32,6 @@
    <arg choice="opt"><option>-h <replaceable>ip:port</replaceable></option></arg>
    <arg choice="opt"><option>-l <replaceable>logfile</replaceable></option></arg>
    <arg choice="opt"><option>-p <replaceable>pidfile</replaceable></option></arg>
-   <arg choice="opt"><option>-t <replaceable>path</replaceable></option></arg>
    <arg choice="opt"><option>-T <replaceable>session_timeout</replaceable></option></arg>
    <arg choice="opt"><option>-u <replaceable>uid</replaceable></option></arg>
    <arg choice="opt"><option>-V</option></arg>
@@ -113,16 +112,6 @@
    </varlistentry>
 
    <varlistentry>
-    <term><option>-t <replaceable>path</replaceable></option></term>
-    <listitem>
-     <para>
-      Specifies a file or directory with alternative settings. This
-      overrides the <literal>settings</literal> element in the main
-      configuration.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
     <term><option>-T <replaceable>session_timeout</replaceable></option></term>
     <listitem>
      <para>
diff --git a/src/pazpar2.c b/src/pazpar2.c
index 56d2599..d7e8c98 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -34,13 +34,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <yaz/sc.h>
 
-static char *path_override = 0;
 static struct conf_config *sc_stop_config = 0;
 
 void child_handler(void *data)
 {
     struct conf_config *config = (struct conf_config *) data;
-    config_read_settings(config, path_override);
+    config_read_settings(config);
 
     pazpar2_event_loop();
 }
@@ -105,7 +104,7 @@ static int sc_main(
     yaz_log_init_prefix("pazpar2");
     yaz_log_xml_errors(0, YLOG_WARN);
 
-    while ((ret = options("dDf:h:l:p:t:T:u:VX", argv, argc, &arg)) != -2)
+    while ((ret = options("dDf:h:l:p:T:u:VX", argv, argc, &arg)) != -2)
     {
 	switch (ret)
         {
@@ -131,9 +130,6 @@ static int sc_main(
         case 'p':
             pidfile = arg;
             break;
-        case 't':
-            path_override = arg;
-            break;
         case 'T':
 	    session_timeout = atoi(arg);
 	    if (session_timeout < 9 || session_timeout > 86400)
@@ -160,7 +156,6 @@ static int sc_main(
                     "    -h [host:]port          (REST protocol listener)\n"
                     "    -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"
diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c
index 3e2290e..4745458 100644
--- a/src/pazpar2_config.c
+++ b/src/pazpar2_config.c
@@ -930,16 +930,13 @@ void config_destroy(struct conf_config *config)
     }
 }
 
-void config_read_settings(struct conf_config *config,
-                          const char *path_override)
+void config_read_settings(struct conf_config *config)
 {
     struct conf_service *s = config->servers->service;
     for (;s ; s = s->next)
     {
         init_settings(s);
-        if (path_override)
-            settings_read(s, path_override);
-        else if (s->settings)
+        if (s->settings)
             settings_read(s, s->settings);
         else if (config->servers->server_settings)
             settings_read(s, config->servers->server_settings);
diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 29c7e20..2298cff 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -174,8 +174,7 @@ void config_destroy(struct conf_config *config);
 xsltStylesheet *conf_load_stylesheet(struct conf_config *config,
                                      const char *fname);
 
-void config_read_settings(struct conf_config *config,
-                          const char *path_override);
+void config_read_settings(struct conf_config *config);
 
 struct conf_service *locate_service(struct conf_server *server,
                                     const char *service_id);
-- 
1.7.10.4