X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=isamb%2Ftstisamb.c;h=c572d6960e2f8f06beadc9fc71d44413d4f92086;hp=a85b27687d3c5145f91ae6043b9491c5e2dda6d3;hb=a66b7d79383ae700f3358731eecfe2aafed0e90d;hpb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e

diff --git a/isamb/tstisamb.c b/isamb/tstisamb.c
index a85b276..c572d69 100644
--- a/isamb/tstisamb.c
+++ b/isamb/tstisamb.c
@@ -1,8 +1,5 @@
-/* $Id: tstisamb.c,v 1.23 2006-05-10 08:13:27 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2010 Index Data
 
 Zebra 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
@@ -15,11 +12,18 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
+#if HAVE_SYS_TIMES_H
+#include <sys/times.h>
+#endif
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <yaz/log.h>
@@ -27,16 +31,18 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <idzebra/isamb.h>
 #include <assert.h>
 
+static int log_level = 0;
+
 static void log_item(int level, const void *b, const char *txt)
 {
     int x;
     memcpy(&x, b, sizeof(int));
-    yaz_log(YLOG_DEBUG, "%s %d", txt, x);
+    yaz_log(log_level, "%s %d", txt, x);
 }
 
 static void log_pr(const char *txt)
 {
-    yaz_log(YLOG_DEBUG, "%s", txt);
+    yaz_log(log_level, "%s", txt);
 }
 
 int compare_item(const void *a, const void *b)
@@ -52,7 +58,7 @@ int compare_item(const void *a, const void *b)
    return 0;
 }
 
-void *code_start()
+void *code_start(void)
 {
     return 0;
 }
@@ -96,8 +102,8 @@ int code_read(void *vp, char **dst, int *insertMode)
     ri->val = ri->val + ri->step;
     *insertMode = ri->insertMode;
 
-#if 1
-    yaz_log(YLOG_DEBUG, "%d %5d", ri->insertMode, x);
+#if 0
+    yaz_log(log_level, "%d %5d", ri->insertMode, x);
 #endif
     return 1;
 }
@@ -140,7 +146,7 @@ void tst_insert(ISAMB isb, int n)
 	    nerrs++;
 	}
 	else if (nerrs)
-	    yaz_log(YLOG_LOG, "isamb_pp_read. n=%d Got %d",
+	    yaz_log(log_level, "isamb_pp_read. n=%d Got %d",
 		    n, x);
 
 	ri.val++;
@@ -556,7 +562,6 @@ int main(int argc, char **argv)
 	yaz_log(YLOG_WARN, "isamb_open failed");
 	exit(2);
     }
-#if 1
     tst_insert(isb, 1);
     tst_insert(isb, 2);
     tst_insert(isb, 20);
@@ -569,7 +574,6 @@ int main(int argc, char **argv)
     tst_x(isb);
 
     tst_append(isb, 1000);
-#endif
 
     if (0)
 	identical_keys_tests(isb);
@@ -584,6 +588,7 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab