Refactor stuff from logic.c: connection stuff in connection.[ch],

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

diff --git a/src/pazpar2.c b/src/pazpar2.c
index d1ecf15..721f501 100644 (file)
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.c,v 1.81 2007-04-20 16:21:19 quinn Exp $
+/* $Id: pazpar2.c,v 1.83 2007-04-23 21:05:23 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -25,6 +25,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 
 #include <signal.h>
+#include <assert.h>
 
 #include "pazpar2.h"
 #include "database.h"
@@ -59,9 +60,6 @@ int main(int argc, char **argv)
             case 't':
                 strcpy(global_parameters.settings_path_override, arg);
                 break;
-            case 's':
-                load_simpletargets(arg);
-                break;
             case 'd':
                 global_parameters.dump_records = 1;
                 break;
@@ -88,13 +86,14 @@ int main(int argc, char **argv)
     start_http_listener();
     start_proxy();
     start_zproxy();
+    init_settings();
 
     if (*global_parameters.settings_path_override)
         settings_read(global_parameters.settings_path_override);
     else if (global_parameters.server->settings)
         settings_read(global_parameters.server->settings);
     else
-        yaz_log(YLOG_WARN, "No settings-directory specified. Problems may well ensue!");
+        yaz_log(YLOG_WARN, "No settings-directory specified");
     global_parameters.odr_in = odr_createmem(ODR_DECODE);
     global_parameters.odr_out = odr_createmem(ODR_ENCODE);
 
@@ -103,6 +102,7 @@ int main(int argc, char **argv)
     return 0;
 }
 
+
 /*
  * Local variables:
  * c-basic-offset: 4