X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=6b387b7883482bf6b5dc52898c1e0e182dbefb80;hb=9182020c2b30530bb419946a30e6632d138e9378;hp=d0ff5702cedda4ea0bc96bb1fe78ffeae22bee58;hpb=2fdf141842b8984d0b118623e75d0b243d02f5de;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.c b/src/pazpar2.c
index d0ff570..6b387b7 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,5 +1,5 @@
 /* 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
@@ -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)
 {
@@ -62,12 +56,17 @@ void child_handler(void *data)
 static void show_version(void)
 {
     char yaz_version_str[80];
-    printf("Pazpar2 " PACKAGE_VERSION "\n");
+    printf("Pazpar2 " PACKAGE_VERSION 
+#ifdef PAZPAR2_VERSION_SHA1
+           " "
+           PAZPAR2_VERSION_SHA1
+#endif
+"\n");
 
     yaz_version(yaz_version_str, 0);
 
     printf("Configuration:");
-#if HAVE_ICU
+#if YAZ_HAVE_ICU
     printf(" icu:?");
 #endif
     printf(" yaz:%s", yaz_version_str);
@@ -90,9 +89,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;
@@ -110,10 +107,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)
     {
@@ -162,6 +156,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;
 	}
@@ -185,9 +183,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) +
@@ -198,32 +194,28 @@ 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);
 }
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+