X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=117464c1054d924f69decc1332d49bfc3d036130;hb=2fdbd5de9185e926401609c22b328f07af0248bd;hp=d1ecf1510b39fc1a4ae4aa6cbbbf343eecfe3c85;hpb=9856b661bf3d99be5b397040d3163e769a3e360b;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.c b/src/pazpar2.c
index d1ecf15..117464c 100644
--- 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.85 2007-05-23 21:58:28 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"
@@ -38,43 +39,49 @@ int main(int argc, char **argv)
     if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
         yaz_log(YLOG_WARN|YLOG_ERRNO, "signal");
 
-    yaz_log_init(YLOG_DEFAULT_LEVEL, "pazpar2", 0);
+    yaz_log_init_prefix("pazpar2");
 
-    while ((ret = options("t:f:x:h:p:z:s:d", argv, argc, &arg)) != -2)
+    while ((ret = options("f:h:p:z:t:l:dX", argv, argc, &arg)) != -2)
     {
-	switch (ret) {
-            case 'f':
-                if (!read_config(arg))
-                    exit(1);
-                break;
-            case 'h':
-                strcpy(global_parameters.listener_override, arg);
-                break;
-            case 'p':
-                strcpy(global_parameters.proxy_override, arg);
-                break;
-            case 'z':
-                strcpy(global_parameters.zproxy_override, arg);
-                break;
-            case 't':
-                strcpy(global_parameters.settings_path_override, arg);
-                break;
-            case 's':
-                load_simpletargets(arg);
-                break;
-            case 'd':
-                global_parameters.dump_records = 1;
-                break;
-	    default:
-		fprintf(stderr, "Usage: pazpar2\n"
-                        "    -f configfile\n"
-                        "    -h [host:]port          (REST protocol listener)\n"
-                        "    -C cclconfig\n"
-                        "    -s simpletargetfile\n"
-                        "    -p hostname[:portno]    (HTTP proxy)\n"
-                        "    -z hostname[:portno]    (Z39.50 proxy)\n"
-                        "    -d                      (show internal records)\n");
-		exit(1);
+	switch (ret)
+        {
+        case 'f':
+            if (!read_config(arg))
+                exit(1);
+            break;
+        case 'h':
+            strcpy(global_parameters.listener_override, arg);
+            break;
+        case 'p':
+            strcpy(global_parameters.proxy_override, arg);
+            break;
+        case 'z':
+            strcpy(global_parameters.zproxy_override, arg);
+            break;
+        case 't':
+            strcpy(global_parameters.settings_path_override, arg);
+             break;
+        case 'd':
+            global_parameters.dump_records = 1;
+            break;
+        case 'l':
+            yaz_log_init_file(arg);
+            break;
+        case 'X':
+            global_parameters.debug_mode = 1;
+            break;
+        default:
+            fprintf(stderr, "Usage: pazpar2\n"
+                    "    -f configfile\n"
+                    "    -h [host:]port          (REST protocol listener)\n"
+                    "    -p hostname[:portno]    (HTTP proxy)\n"
+                    "    -z hostname[:portno]    (Z39.50 proxy)\n"
+                    "    -t settings\n"
+                    "    -d                      (show internal records)\n"
+                    "    -l file                 log to file\n"
+                    "    -X                      debug mode\n"
+                );
+            exit(1);
 	}
     }
 
@@ -88,13 +95,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 +111,7 @@ int main(int argc, char **argv)
     return 0;
 }
 
+
 /*
  * Local variables:
  * c-basic-offset: 4