X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ftestlib.c;h=583a2c40275a0d621d45df0e307ff848e3419a0b;hb=790139cda48a3bea01df242d4372bffaba94f368;hp=18f3cd9ea496dbca32e8b748fb4c6eb9e70b7299;hpb=c401b3a1421e31b3d6b77bc7bac6ffb934207df1;p=idzebra-moved-to-github.git

diff --git a/test/api/testlib.c b/test/api/testlib.c
index 18f3cd9..583a2c4 100644
--- a/test/api/testlib.c
+++ b/test/api/testlib.c
@@ -1,5 +1,5 @@
-/* $Id: testlib.c,v 1.39 2006-10-29 17:20:01 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: testlib.c,v 1.45 2007-04-18 11:37:39 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -35,37 +35,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <assert.h>
 #include <yaz/log.h>
 #include <yaz/pquery.h>
+#include <yaz/oid_db.h>
 #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
  *      if no argv passed, do not open a log
  *    - read zebra.cfg from env var srcdir if it exists; otherwise current dir 
@@ -81,8 +58,6 @@ ZebraService tl_start_up(char *cfgname, int argc, char **argv)
     setrlimit(RLIMIT_CPU, &rlim);
 #endif
 #endif
-    nmem_init();
-    tl_start_log(argc, argv);
     return tl_zebra_start(cfgname);
 }
 
@@ -117,7 +92,6 @@ int tl_close_down(ZebraHandle zh, ZebraService zs)
     if (zs)
         zebra_stop(zs);
 
-    nmem_exit();
     xmalloc_trav("x");
     return 1;
 }
@@ -148,7 +122,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);
@@ -340,7 +321,7 @@ int tl_ranking_query(ZebraHandle zh, char *query,
 
     odr_output = odr_createmem(ODR_ENCODE);    
     rc = zebra_records_retrieve(zh, odr_output, setname, 0,
-                                VAL_TEXT_XML, exphits, retrievalRecord);
+                                yaz_oid_recsyn_xml, exphits, retrievalRecord);
     if (rc != ZEBRA_OK)
         ret = 0;
     else if (!strstr(retrievalRecord[0].buf, firstrec))