X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=371d6f5f5d6dab3ae228fe3be8c0fe650f726e49;hb=5fdac8e7a282d625568f5768bd3ae9367dd4acaf;hp=6efd068b7a4c60c18aab95fc7b53794effccb4f0;hpb=1853168ac9b85627a95a8067ef5c6cdc9f82b16d;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2.c b/src/pazpar2.c index 6efd068..371d6f5 100644 --- a/src/pazpar2.c +++ b/src/pazpar2.c @@ -1,7 +1,5 @@ -/* $Id: pazpar2.c,v 1.87 2007-06-08 13:57:19 adam Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + Copyright (C) 2006-2008 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -14,15 +12,17 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Pazpar2; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ #if HAVE_CONFIG_H -#include "cconfig.h" +#include +#endif +#ifdef WIN32 +#include #endif - #include #include @@ -30,13 +30,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "pazpar2.h" #include "database.h" #include "settings.h" +#include +#include void child_handler(void *data) { - yaz_log(YLOG_LOG, "child_handler"); - start_proxy(); - //start_zproxy(); init_settings(); if (*global_parameters.settings_path_override) @@ -50,24 +49,71 @@ void child_handler(void *data) pazpar2_event_loop(); + } -int main(int argc, char **argv) +static void show_version(void) { + char yaz_version_str[80]; + printf("Pazpar2 " PACKAGE_VERSION "\n"); + + yaz_version(yaz_version_str, 0); + + printf("Configuration:"); +#if HAVE_ICU + printf(" icu:?"); +#endif + printf(" yaz:%s", yaz_version_str); + printf("\n"); + exit(0); +} + +#ifdef WIN32 +static int tcpip_init (void) +{ + WORD requested; + WSADATA wd; + + requested = MAKEWORD(1, 1); + if (WSAStartup(requested, &wd)) + return 0; + return 1; +} +#endif + + +static int sc_main(yaz_sc_t s, int argc, char **argv) +{ + int daemon = 0; int ret; + int log_file_in_use = 0; char *arg; - const char *pidfile = "pazpar2.pid"; + const char *pidfile = 0; + const char *uid = 0; +#ifndef WIN32 if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) yaz_log(YLOG_WARN|YLOG_ERRNO, "signal"); +#else + tcpip_init(); +#endif yaz_log_init_prefix("pazpar2"); +#if YAZ_VERSIONL >= 0x03001B + yaz_log_xml_errors(0, YLOG_WARN); +#endif - //while ((ret = options("f:h:p:z:t:l:dX", argv, argc, &arg)) != -2) - while ((ret = options("f:h:p:t:l:dX", argv, argc, &arg)) != -2) + + while ((ret = options("dDf:h:l:p:t:u:VX", argv, argc, &arg)) != -2) { switch (ret) { + case 'd': + global_parameters.dump_records = 1; + break; + case 'D': + daemon = 1; + break; case 'f': if (!read_config(arg)) exit(1); @@ -75,39 +121,48 @@ int main(int argc, char **argv) case 'h': strcpy(global_parameters.listener_override, arg); break; + case 'l': + yaz_log_init_file(arg); + log_file_in_use = 1; + break; case 'p': - strcpy(global_parameters.proxy_override, arg); + pidfile = 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); + case 'u': + uid = arg; break; + case 'V': + show_version(); case 'X': global_parameters.debug_mode = 1; break; default: fprintf(stderr, "Usage: pazpar2\n" + " -d (show internal records)\n" + " -D Daemon mode (background)\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" + " -p pidfile PID file\n" + " -t settings\n" + " -u uid\n" + " -V show version\n" " -X debug mode\n" ); exit(1); } } + yaz_log(YLOG_LOG, "Pazpar2 %s started", VERSION); + if (daemon && !log_file_in_use) + { + yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon " + "mode"); + exit(1); + } if (!config) { yaz_log(YLOG_FATAL, "Load config with -f"); @@ -115,13 +170,37 @@ int main(int argc, char **argv) } global_parameters.server = config->servers; - start_http_listener(); - pazpar2_process(global_parameters.debug_mode, 0, child_handler, 0, - pidfile, 0); + ret = start_http_listener(); + if (ret) + return ret; /* error starting http listener */ + + yaz_sc_running(s); + + yaz_daemon("pazpar2", + (global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) + + (daemon ? YAZ_DAEMON_FORK : 0) + YAZ_DAEMON_KEEPALIVE, + child_handler, 0 /* child_data */, + pidfile, uid); return 0; } +static void sc_stop(yaz_sc_t s) +{ + +} + +int main(int argc, char **argv) +{ + int ret; + yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar Metasearcher"); + + ret = yaz_sc_program(s, argc, argv, sc_main, sc_stop); + + yaz_sc_destroy(&s); + exit(ret); +} + /* * Local variables: * c-basic-offset: 4