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
Add XSLT sheet for Connector Frameworks records.
[pazpar2-moved-to-github.git]
/
src
/
pazpar2.c
diff --git
a/src/pazpar2.c
b/src/pazpar2.c
index
d0ff570
..
3352fa0
100644
(file)
--- a/
src/pazpar2.c
+++ b/
src/pazpar2.c
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* This file is part of Pazpar2.
- Copyright (C) 2006-2008 Index Data
+ Copyright (C) 2006-2009 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
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
@@
-32,13
+32,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "settings.h"
#include <yaz/daemon.h>
#include "settings.h"
#include <yaz/daemon.h>
-#if YAZ_VERSIONL >= 0x03001D
-/* Windows service is available in YAZ 3.0.29 or later */
-#define USE_SC 1
#include <yaz/sc.h>
#include <yaz/sc.h>
-#else
-#define USE_SC 0
-#endif
void child_handler(void *data)
{
void child_handler(void *data)
{
@@
-67,7
+61,7
@@
static void show_version(void)
yaz_version(yaz_version_str, 0);
printf("Configuration:");
yaz_version(yaz_version_str, 0);
printf("Configuration:");
-#if HAVE_ICU
+#if YAZ_HAVE_ICU
printf(" icu:?");
#endif
printf(" yaz:%s", yaz_version_str);
printf(" icu:?");
#endif
printf(" yaz:%s", yaz_version_str);
@@
-90,9
+84,7
@@
static int tcpip_init (void)
static int sc_main(
static int sc_main(
-#if USE_SC
yaz_sc_t s,
yaz_sc_t s,
-#endif
int argc, char **argv)
{
int daemon = 0;
int argc, char **argv)
{
int daemon = 0;
@@
-110,10
+102,7
@@
static int sc_main(
#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)
{
@@
-162,6
+151,10
@@
static int sc_main(
" -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
);
return 1;
}
);
return 1;
}
@@
-185,9
+178,7
@@
static int sc_main(
if (ret)
return ret; /* error starting http listener */
if (ret)
return ret; /* error starting http listener */
-#if USE_SC
yaz_sc_running(s);
yaz_sc_running(s);
-#endif
yaz_daemon("pazpar2",
(global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
yaz_daemon("pazpar2",
(global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
@@
-198,32
+189,28
@@
static int sc_main(
}
}
-#if USE_SC
static void sc_stop(yaz_sc_t s)
{
http_close_server();
}
static void sc_stop(yaz_sc_t s)
{
http_close_server();
}
-#endif
int main(int argc, char **argv)
{
int ret;
int main(int argc, char **argv)
{
int ret;
-#if USE_SC
yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar2");
ret = yaz_sc_program(s, argc, argv, sc_main, sc_stop);
yaz_sc_destroy(&s);
yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar2");
ret = yaz_sc_program(s, argc, argv, sc_main, sc_stop);
yaz_sc_destroy(&s);
-#else
- ret = sc_main(argc, argv);
-#endif
exit(ret);
}
/*
* Local variables:
* c-basic-offset: 4
exit(ret);
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+