X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=86e49d69bf2dd97c7f205fc63bc9eb2a7157f2f7;hb=174ad2c7bbf2b7312ac080de2fd85d0509a55404;hp=83a4c7bb95af312c7d84fff78666a1a010251f7e;hpb=ec214819d7b9e2f5c362584d8e38f83e13aae600;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 83a4c7b..86e49d6 100644
--- a/index/main.c
+++ b/index/main.c
@@ -1,6 +1,6 @@
-/* $Id: main.c,v 1.113 2004-08-25 09:23:36 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: main.c,v 1.121 2005-01-15 19:38:26 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,7 +20,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
@@ -35,19 +34,22 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <sys/times.h>
 #endif
 
-#if HAVE_TCL_H
-#include <tcl.h>
-#endif
-
-#if HAVE_EXPAT_H
-#include <expat.h>
-#endif
-
-#include <data1.h>
+#include <yaz/log.h>
+#include <yaz/options.h>
 #include <idzebra/api.h>
 
 char *prog;
 
+static void filter_cb(void *cd, const char *name)
+{
+    puts (name);
+}
+
+static void show_filters(ZebraService zs)
+{
+    zebra_filter_info(zs, 0, filter_cb);
+}
+
 int main (int argc, char **argv)
 {
     int ret;
@@ -55,7 +57,7 @@ int main (int argc, char **argv)
     char *arg;
     char *configName = 0;
     int nsections = 0;
-    int disableCommit = 0;
+    int enable_commit = 1;
     char *database = "Default";
     Res res = res_open(0, 0, 0);
     
@@ -75,7 +77,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
@@ -120,22 +122,21 @@ 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);
-                    if (disableCommit)
-                        zebra_shadow_enable (zh, 0);
+		    zebra_shadow_enable (zh, enable_commit);
                 }
 
 		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);
 		}
@@ -181,9 +182,13 @@ int main (int argc, char **argv)
                 {
                     zebra_compact (zh);
                 }
+                else if (!strcmp (arg, "filters"))
+                {
+                    show_filters(zs);
+                }
                 else
                 {
-                    logf (LOG_FATAL, "unknown command: %s", arg);
+                    yaz_log (YLOG_FATAL, "unknown command: %s", arg);
                     exit (1);
                 }
             }
@@ -233,17 +238,6 @@ int main (int argc, char **argv)
 #if HAVE_BZLIB_H
             printf("Using: libbzip2, (C) 1996-1999 Julian R Seward.  All rights reserved.\n");
 #endif
-#if HAVE_TCL_H
-	    printf("Using: Tcl %s\n", TCL_VERSION);
-#endif
-#if HAVE_EXPAT_H
-	    if (1)
-	    {
-		XML_Expat_Version v = XML_ExpatVersionInfo();
-		printf ("Using: Expat %d.%d.%d\n",
-			v.major, v.minor, v.micro);
-	    }
-#endif
         }
         else if (ret == 'v')
             yaz_log_init_level (yaz_log_mask_str(arg));
@@ -264,11 +258,11 @@ int main (int argc, char **argv)
         else if (ret == 't')
 	    res_set(res, "recordType", arg);
         else if (ret == 'n')
-	    res_set(res, "disableCommit", "1");
-        else if (ret == 'L')
+	    enable_commit = 0;
+	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)
@@ -283,7 +277,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);