X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=52a7ab0605a6b7a77c20b403197072900b8e4bb4;hb=2a0dfef5445280fb460590123807ff73016f1ca4;hp=11844d11ad7ab4282c02ceb3d48c6f7e7880f966;hpb=d0833a4d6e48ad7f9a5a7d0b9e37a1c31b9968ef;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 11844d1..52a7ab0 100644
--- a/index/main.c
+++ b/index/main.c
@@ -1,6 +1,6 @@
-/* $Id: main.c,v 1.117 2004-09-28 20:09:13 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: main.c,v 1.122 2005-01-16 23:14:57 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -21,6 +21,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #ifdef WIN32
@@ -77,7 +78,7 @@ int main (int argc, char **argv)
 
 #ifdef WIN32
 #else
-    sprintf(nbuf, "%.40s(%d)", *argv, getpid());
+    sprintf(nbuf, "%.40s(%ld)", *argv, (long) getpid());
     yaz_log_init_prefix (nbuf);
 #endif
 #if HAVE_SYS_TIMES_H
@@ -122,12 +123,12 @@ int main (int argc, char **argv)
                 if (!zs)
                 {
 		    const char *config = configName ? configName : "zebra.cfg";
-                    logf (LOG_LOG, "Zebra version %s %s",
+                    yaz_log (YLOG_LOG, "Zebra version %s %s",
                           ZEBRAVER, ZEBRADATE);
                     zs = zebra_start_res (config, 0, res);
                     if (!zs)
                     {
-			yaz_log (LOG_FATAL, "Cannot read config %s", config);
+			yaz_log (YLOG_FATAL, "Cannot read config %s", config);
                         exit (1);
 	            }	
                     zh = zebra_open (zs);
@@ -136,7 +137,7 @@ int main (int argc, char **argv)
 
 		if (zebra_select_database (zh, database))
 		{
-		    logf(LOG_FATAL, "Could not select database %s errCode=%d",
+		    yaz_log(YLOG_FATAL, "Could not select database %s errCode=%d",
 			 database, zebra_errCode(zh) );
 		    exit (1);
 		}
@@ -188,7 +189,7 @@ int main (int argc, char **argv)
                 }
                 else
                 {
-                    logf (LOG_FATAL, "unknown command: %s", arg);
+                    yaz_log (YLOG_FATAL, "unknown command: %s", arg);
                     exit (1);
                 }
             }
@@ -262,7 +263,7 @@ int main (int argc, char **argv)
 	else if (ret == 'L')
 	    res_set(res, "followLinks", "0");
         else
-            logf (LOG_WARN, "unknown option '-%s'", arg);
+            yaz_log (YLOG_WARN, "unknown option '-%s'", arg);
     } /* while arg */
 
     if (trans_started)
@@ -277,7 +278,7 @@ int main (int argc, char **argv)
         usec = (end_time.tv_sec - start_time.tv_sec) * 1000000.0 +
 	    end_time.tv_usec - start_time.tv_usec;
         times(&tms2);
-        yaz_log (LOG_LOG, "zebraidx times: %5.2f %5.2f %5.2f",
+        yaz_log (YLOG_LOG, "zebraidx times: %5.2f %5.2f %5.2f",
 		usec / 1000000,
 		(double) (tms2.tms_utime - tms1.tms_utime)/100,
 		(double) (tms2.tms_stime - tms1.tms_stime)/100);