-/* $Id: pazpar2.c,v 1.81 2007-04-20 16:21:19 quinn Exp $
+/* $Id: pazpar2.c,v 1.84 2007-05-15 21:27:55 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
#include <signal.h>
+#include <assert.h>
#include "pazpar2.h"
#include "database.h"
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:d", 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;
+ 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"
+ );
+ exit(1);
}
}
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);
return 0;
}
+
/*
* Local variables:
* c-basic-offset: 4