projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated to new m4.
[pazpar2-moved-to-github.git]
/
src
/
pazpar2.c
diff --git
a/src/pazpar2.c
b/src/pazpar2.c
index
371d6f5
..
0ede6be
100644
(file)
--- a/
src/pazpar2.c
+++ b/
src/pazpar2.c
@@
-31,6
+31,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "database.h"
#include "settings.h"
#include <yaz/daemon.h>
#include "database.h"
#include "settings.h"
#include <yaz/daemon.h>
+
#include <yaz/sc.h>
void child_handler(void *data)
#include <yaz/sc.h>
void child_handler(void *data)
@@
-82,7
+83,9
@@
static int tcpip_init (void)
#endif
#endif
-static int sc_main(yaz_sc_t s, int argc, char **argv)
+static int sc_main(
+ yaz_sc_t s,
+ int argc, char **argv)
{
int daemon = 0;
int ret;
{
int daemon = 0;
int ret;
@@
-99,10
+102,7
@@
static int sc_main(yaz_sc_t s, int argc, char **argv)
#endif
yaz_log_init_prefix("pazpar2");
#endif
yaz_log_init_prefix("pazpar2");
-#if YAZ_VERSIONL >= 0x03001B
yaz_log_xml_errors(0, YLOG_WARN);
yaz_log_xml_errors(0, YLOG_WARN);
-#endif
-
while ((ret = options("dDf:h:l:p:t:u:VX", argv, argc, &arg)) != -2)
{
while ((ret = options("dDf:h:l:p:t:u:VX", argv, argc, &arg)) != -2)
{
@@
-151,8
+151,12
@@
static int sc_main(yaz_sc_t s, int argc, char **argv)
" -u uid\n"
" -V show version\n"
" -X debug mode\n"
" -u uid\n"
" -V show version\n"
" -X debug mode\n"
+#ifdef WIN32
+ " -install install windows service\n"
+ " -remove remove windows service\n"
+#endif
);
);
- exit(1);
+ return 1;
}
}
}
}
@@
-161,12
+165,12
@@
static int sc_main(yaz_sc_t s, int argc, char **argv)
{
yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon "
"mode");
{
yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon "
"mode");
- exit(1);
+ return 1;
}
if (!config)
{
yaz_log(YLOG_FATAL, "Load config with -f");
}
if (!config)
{
yaz_log(YLOG_FATAL, "Load config with -f");
- exit(1);
+ return 1;
}
global_parameters.server = config->servers;
}
global_parameters.server = config->servers;
@@
-187,13
+191,13
@@
static int sc_main(yaz_sc_t s, int argc, char **argv)
static void sc_stop(yaz_sc_t s)
{
static void sc_stop(yaz_sc_t s)
{
-
+ http_close_server();
}
int main(int argc, char **argv)
{
int ret;
}
int main(int argc, char **argv)
{
int ret;
- yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar Metasearcher");
+ yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar2");
ret = yaz_sc_program(s, argc, argv, sc_main, sc_stop);
ret = yaz_sc_program(s, argc, argv, sc_main, sc_stop);