X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fapi%2Ftestlib.c;h=ad878d617663231359a586fe47a57d0a063619ac;hb=89d3a004b7c651fd5673abfc192e1472dc4d4197;hp=5735254660ff6260580aecd743b07834bb5e4581;hpb=9aacfd0955fc70f27165254a2844618c85e8600d;p=idzebra-moved-to-github.git

diff --git a/test/api/testlib.c b/test/api/testlib.c
index 5735254..ad878d6 100644
--- a/test/api/testlib.c
+++ b/test/api/testlib.c
@@ -1,5 +1,5 @@
-/* $Id: testlib.c,v 1.38 2006-09-08 09:56:40 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: testlib.c,v 1.42 2007-01-15 15:10:20 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -38,32 +38,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <idzebra/api.h>
 #include "testlib.h"
 
-/** start_log: open a log file */
-/*    FIXME - parse command line arguments to set log levels etc */
-int log_level=0; /* not static, t*.c may use it */
+int log_level = YLOG_LOG;
 
-void tl_start_log(int argc, char **argv)
-{
-    char logname[2048];
-    if (!argv) 
-        return;
-    if (!argv[0])
-        return;
-    sprintf(logname, "%s.log", argv[0]);
-#if HAVE_UNISTD_H
-    unlink(logname);
-#endif
-    yaz_log_init_file(logname);
-    if (argc >= 2)
-	log_level = yaz_log_mask_str_x(argv[1], 0);
-    if (argc >= 3)
-	yaz_log_time_format(argv[2]);
-    if (log_level)
-        yaz_log_init_level(log_level);
-    yaz_log(log_level, "starting %s", argv[0]);
-}
-
-/** 
+/* 
  * tl_start_up : do common start things, and a zebra_start
  *    - nmem_init
  *    - build the name of logfile from argv[0], and open it
@@ -82,14 +59,13 @@ ZebraService tl_start_up(char *cfgname, int argc, char **argv)
 #endif
 #endif
     nmem_init();
-    tl_start_log(argc, argv);
     return tl_zebra_start(cfgname);
 }
 
 /**
  * get_srcdir: return env srcdir or . (if does does not exist)
  */
-const char *tl_get_srcdir()
+const char *tl_get_srcdir(void)
 {
     const char *srcdir = getenv("srcdir");
     if (!srcdir || ! *srcdir)
@@ -148,7 +124,14 @@ int tl_init_data(ZebraHandle zh, const char **recs)
 	if (zebra_begin_trans (zh, 1) != ZEBRA_OK)
 	    return 0;
         for (i = 0; recs[i]; i++)
-            zebra_add_record(zh, recs[i], strlen(recs[i]));
+        {
+            if (zebra_add_record(zh, recs[i], strlen(recs[i])) != ZEBRA_OK)
+            {
+                if (zebra_end_trans(zh) != ZEBRA_OK)
+                    return 0;
+                return 0;
+            }
+        }
         if (zebra_end_trans(zh) != ZEBRA_OK)
 	    return 0;
         zebra_commit(zh);