X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=0ede6be1f79f70fd3fdc6dc8034338080beb835a;hb=142c8c510a7b23c633272c656e45277e4ec35d30;hp=25674e79946b316284c23973cd90f84bd24fbee3;hpb=caccd7d8b406e79df7e43a0e37dd3ba363094c1a;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 25674e7..0ede6be 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -32,13 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #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>
-#else
-#define USE_SC 0
-#endif
 
 void child_handler(void *data)
 {
@@ -90,9 +84,7 @@ static int tcpip_init (void)
 
 
 static int sc_main(
-#if USE_SC
     yaz_sc_t s, 
-#endif
     int argc, char **argv)
 {
     int daemon = 0;
@@ -101,10 +93,7 @@ static int sc_main(
     char *arg;
     const char *pidfile = 0;
     const char *uid = 0;
-    int i;
 
-    for (i = 0; i < argc; i++)
-        yaz_log(YLOG_LOG, "arg%d: %s", i, argv[i]);
 #ifndef WIN32
     if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
         yaz_log(YLOG_WARN|YLOG_ERRNO, "signal");
@@ -113,10 +102,7 @@ static int sc_main(
 #endif
 
     yaz_log_init_prefix("pazpar2");
-#if YAZ_VERSIONL >= 0x03001B
     yaz_log_xml_errors(0, YLOG_WARN);
-#endif
-
 
     while ((ret = options("dDf:h:l:p:t:u:VX", argv, argc, &arg)) != -2)
     {
@@ -165,6 +151,10 @@ static int sc_main(
                     "    -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;
 	}
@@ -188,9 +178,7 @@ static int sc_main(
     if (ret)
         return ret; /* error starting http listener */
 
-#if USE_SC
     yaz_sc_running(s);
-#endif
 
     yaz_daemon("pazpar2",
                (global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
@@ -201,25 +189,19 @@ static int sc_main(
 }
 
 
-#if USE_SC
 static void sc_stop(yaz_sc_t s)
 {
     http_close_server();
 }
-#endif
 
 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);
-#else
-    ret = sc_main(argc, argv);
-#endif
     exit(ret);
 }