X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft2.c;h=fcfa4d4d8282145bb87dbf2f93aacda07a6d470a;hb=74fdf8a15af7bb827a256d9df3ecc34a57d2120f;hp=03ac063185f9cb4f3a9742678cbfaea22c4aaf5a;hpb=2a6f64379961f30bfe6376964ce279ab5242da1f;p=idzebra-moved-to-github.git

diff --git a/test/api/t2.c b/test/api/t2.c
index 03ac063..fcfa4d4 100644
--- a/test/api/t2.c
+++ b/test/api/t2.c
@@ -1,6 +1,6 @@
-/* $Id: t2.c,v 1.8 2004-01-22 11:27:22 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: t2.c,v 1.18 2006-03-31 15:58:05 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,44 +20,24 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-#include <yaz/log.h>
-#include <zebraapi.h>
+#include "testlib.h"
 
-int main(int argc, char **argv)
-{
-    int exit_code = 0;
-    int hits;
-    ZebraService zs;
-    ZebraHandle zh;
-    const char *myrec =
+const char *myrec[] = {
         "<gils>\n"
         "  <title>My title</title>\n"
-        "</gils>\n";
-
-    yaz_log_init_file("t2.log");
-
-    nmem_init ();
+        "</gils>\n",
+        0};
 
-    zs = zebra_start("t2.cfg", 0, 0);
-    zh = zebra_open (zs);
-    zebra_select_database(zh, "Default");
-    zebra_begin_trans (zh, 1);
+void tst(int argc, char **argv)
+{
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle  zh = zebra_open(zs, 0);
 
-    zebra_add_record (zh, myrec, strlen(myrec));
+    YAZ_CHECK(tl_init_data(zh, myrec));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 my", 1));
 
-    zebra_search_PQF (zh, "@attr 1=4 my", "set1", &hits);
-    if (hits < 1)
-    {
-        yaz_log(LOG_FATAL, "At least one hit expected");
-        exit_code = 1;
-    }
+    YAZ_CHECK(tl_close_down(zh, zs));
+}
 
-    zebra_end_trans (zh);
-    zebra_commit (zh);
-    zebra_close (zh);
-    zebra_stop (zs);
+TL_MAIN
 
-    nmem_exit ();
-    xmalloc_trav ("x");
-    exit (exit_code);
-}