X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft2.c;h=d98178721ebe3f6ee18dc56162dbfa82e004d68d;hb=e172ced0dcc937dfc433a33c7e20962b9e6b5ea0;hp=d61ab163438b0155403b5f9947e0b212632c72cb;hpb=104beff061317519411d779c7c84419ccdfc70e1;p=idzebra-moved-to-github.git

diff --git a/test/api/t2.c b/test/api/t2.c
index d61ab16..d981787 100644
--- a/test/api/t2.c
+++ b/test/api/t2.c
@@ -1,5 +1,5 @@
-/* $Id: t2.c,v 1.7 2003-06-20 14:21:24 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: t2.c,v 1.14 2004-10-29 13:02:39 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -20,43 +20,21 @@ 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");
-    zh = zebra_open (zs);
-    zebra_select_database(zh, "Default");
-    zebra_begin_trans (zh, 1);
-    zebra_record_insert (zh, myrec, strlen(myrec),0);
-
-    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;
-    }
+int main(int argc, char **argv)
+{
+    ZebraService zs = start_up(0, argc, argv);
+    ZebraHandle  zh = zebra_open (zs);
 
-    zebra_end_trans (zh);
-    zebra_commit (zh);
-    zebra_close (zh);
-    zebra_stop (zs);
+    init_data(zh,myrec);
+    do_query(__LINE__,zh, "@attr 1=4 my", 1);
 
-    nmem_exit ();
-    xmalloc_trav ("x");
-    exit (exit_code);
+    return close_down(zh,zs,0);
 }