X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fapi%2Ft2.c;h=449331a87711f5f6022b420685075605a049328b;hp=beb66d613da8c5fb25cd6ad6277e725764752e7f;hb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;hpb=d576d9f0ae1a45fef6fe3281cac1a24999fc8106

diff --git a/test/api/t2.c b/test/api/t2.c
index beb66d6..449331a 100644
--- a/test/api/t2.c
+++ b/test/api/t2.c
@@ -1,6 +1,6 @@
-/* $Id: t2.c,v 1.10 2004-06-14 23:43:32 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: t2.c,v 1.19 2006-05-10 08:13:35 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,55 +20,32 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-#include <stdlib.h>
-#include <yaz/log.h>
-#include <zebraapi.h>
+#include "testlib.h"
 
-/* read zebra.cfg from env var srcdir if it exists; otherwise current dir */
-static ZebraService start_service()
-{
-    char cfg[256];
-    char *srcdir = getenv("srcdir");
-    sprintf(cfg, "%.200s%szebra.cfg", srcdir ? srcdir : "", srcdir ? "/" : "");
-    return zebra_start(cfg, 0, 0);
-}
-
-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";
+        "</gils>\n",
+        0};
 
-    yaz_log_init_file("t2.log");
-
-    nmem_init ();
+void tst(int argc, char **argv)
+{
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle  zh = zebra_open(zs, 0);
 
-    zs = start_service();
-    zh = zebra_open (zs);
-    zebra_select_database(zh, "Default");
-    zebra_init(zh);
-    zebra_begin_trans (zh, 1);
+    YAZ_CHECK(tl_init_data(zh, myrec));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 my", 1));
 
-    zebra_add_record (zh, myrec, strlen(myrec));
+    YAZ_CHECK(tl_close_down(zh, zs));
+}
 
-    zebra_search_PQF (zh, "@attr 1=4 my", "set1", &hits);
-    if (hits != 1)
-    {
-        yaz_log(LOG_FATAL, "Expected 1 hit. Got %d", hits);
-        exit_code = 1;
-    }
+TL_MAIN
 
-    zebra_end_trans (zh);
-    zebra_commit (zh);
-    zebra_close (zh);
-    zebra_stop (zs);
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
 
-    nmem_exit ();
-    xmalloc_trav ("x");
-    exit (exit_code);
-}