X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft6.c;h=23f2cefe7ce047d14458b6adb3e4abe631b3367c;hb=5437b50633032595afe6f87dc0f989bc92a5aea8;hp=35a2cdefef25c6f580e9e2d954b9eb1e6eeb897f;hpb=ec214819d7b9e2f5c362584d8e38f83e13aae600;p=idzebra-moved-to-github.git

diff --git a/test/api/t6.c b/test/api/t6.c
index 35a2cde..23f2cef 100644
--- a/test/api/t6.c
+++ b/test/api/t6.c
@@ -1,4 +1,4 @@
-/* $Id: t6.c,v 1.3 2004-08-25 09:23:39 adam Exp $
+/* $Id: t6.c,v 1.5 2004-10-29 13:02:39 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -20,35 +20,20 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-#include <stdlib.h>
+/** t6.c Insert a number of randomly generated words */
 
-#include <yaz/log.h>
-#include <yaz/pquery.h>
-#include <idzebra/api.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%szebra6.cfg", srcdir ? srcdir : "", srcdir ? "/" : "");
-    return zebra_start(cfg);
-}
 	
 int main(int argc, char **argv)
 {
     int i;
-    ZebraService zs;
-    ZebraHandle zh;
-
-    yaz_log_init_file("t6.log");
+    ZebraService zs = start_up(0, argc, argv);
+    ZebraHandle  zh = zebra_open (zs);
 
-    nmem_init ();
     
     srand(17);
     
-    zs = start_service();
-    zh = zebra_open(zs);
     zebra_select_database(zh, "Default");
     zebra_init(zh);
     zebra_close(zh);
@@ -80,9 +65,6 @@ int main(int argc, char **argv)
 	zebra_end_trans (zh);
 	zebra_close(zh);
     }
-    zebra_stop(zs);
 
-    nmem_exit ();
-    xmalloc_trav ("x");
-    exit (0);
+    return close_down(0 /*zh*/ ,zs,0);
 }