X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=67783887d34377b18808b40e03c812dd4ded0923;hb=197410f262777b4955b23be723afe80d5f63cf77;hp=7ded17adfa4e5111f8d0000ba93d114bbe24ee27;hpb=9f15a2646ae6c666ac16c2d779afc3ee205df069;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 7ded17a..6778388 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.c,v 1.80 2007-04-19 16:07:20 adam Exp $
+/* $Id: pazpar2.c,v 1.82 2007-04-22 15:07:10 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -59,9 +59,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,14 +85,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!");
-    prepare_databases();
+        yaz_log(YLOG_WARN, "No settings-directory specified");
     global_parameters.odr_in = odr_createmem(ODR_DECODE);
     global_parameters.odr_out = odr_createmem(ODR_ENCODE);