X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft2.c;h=6f98f18f9a223e7b130f6ba0bfd86310112cfebd;hb=d03ad0bbaf2bfd26b203c4b8a67483ed6f4d91ab;hp=51f479f068c8df5149f9fe25954e9e1d4123daa0;hpb=4989a5fc444f3bca0f094f1ac2bfe4f04af5e666;p=idzebra-moved-to-github.git

diff --git a/test/api/t2.c b/test/api/t2.c
index 51f479f..6f98f18 100644
--- a/test/api/t2.c
+++ b/test/api/t2.c
@@ -1,6 +1,6 @@
-/* $Id: t2.c,v 1.13 2004-10-28 15:24:36 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: t2.c,v 1.16 2005-01-15 19:38:35 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,41 +20,21 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-#include <stdlib.h>
-#include <yaz/log.h>
-#include <idzebra/api.h>
 #include "testlib.h"
 
-/* read zebra.cfg from env var srcdir if it exists; otherwise current dir */
-
-int main(int argc, char **argv)
-{
-    ZebraService zs;
-    ZebraHandle zh;
-    const char *myrec[] = {
+const char *myrec[] = {
         "<gils>\n"
         "  <title>My title</title>\n"
         "</gils>\n",
         0};
 
+int main(int argc, char **argv)
+{
+    ZebraService zs = start_up(0, argc, argv);
+    ZebraHandle  zh = zebra_open(zs);
 
-    yaz_log_init_file("t2.log");
-
-    nmem_init ();
-
-    zs = start_service(0);
-    zh = zebra_open (zs);
-    init_data(zh,myrec);
-
-    Query(__LINE__,zh, "@attr 1=4 my", 1);
-
-    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");
-    logf(LOG_LOG,"================ All tests OK ");
-    exit (0);
+    return close_down(zh, zs, 0);
 }