More work on settings system.. still not functional.

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

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 776b78c..1a8fdfa 100644 (file)
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.c,v 1.54 2007-03-27 11:25:57 marc Exp $ */
+/* $Id: pazpar2.c,v 1.55 2007-03-28 04:33:41 quinn Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -40,6 +40,7 @@
 #include "relevance.h"
 #include "config.h"
 #include "database.h"
+#include "settings.h"
 
 #define MAX_CHUNK 15
 
@@ -74,6 +75,7 @@ struct parameters global_parameters =
     "",
     "",
     "",
+    "",
     0,
     0,
     30,
@@ -1659,7 +1661,7 @@ int main(int argc, char **argv)
 
     yaz_log_init(YLOG_DEFAULT_LEVEL, "pazpar2", 0);
 
-    while ((ret = options("f:x:h:p:z:C:s:d", argv, argc, &arg)) != -2)
+    while ((ret = options("t:f:x:h:p:z:C:s:d", argv, argc, &arg)) != -2)
     {
        switch (ret) {
             case 'f':
@@ -1678,6 +1680,9 @@ int main(int argc, char **argv)
             case 'z':
                 strcpy(global_parameters.zproxy_override, arg);
                 break;
+            case 't':
+                strcpy(global_parameters.settings_path, arg);
+                break;
             case 's':
                 load_simpletargets(arg);
                 break;
@@ -1708,6 +1713,8 @@ int main(int argc, char **argv)
     start_proxy();
     start_zproxy();
 
+    if (*global_parameters.settings_path)
+        settings_read(global_parameters.settings_path);
     if (!global_parameters.ccl_filter)
         global_parameters.ccl_filter = load_cclfile("../etc/default.bib");
     global_parameters.yaz_marc = yaz_marc_create();