X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=test%2Fapi%2Ft3.c;h=5d7caa536378bf1ce27e76bfe0d946cf04029957;hb=f84ad20a7a6a45d02da7f162fa6bb1137e79a07f;hp=864cad316e52aa06a2f39ec40e75ef982af3eed4;hpb=0229bb1ac74706a4e460a11a8a8712b4ea0f2ebe;p=idzebra-moved-to-github.git

diff --git a/test/api/t3.c b/test/api/t3.c
index 864cad3..5d7caa5 100644
--- a/test/api/t3.c
+++ b/test/api/t3.c
@@ -1,4 +1,4 @@
-/* $Id: t3.c,v 1.10 2004-10-15 10:07:34 heikki Exp $
+/* $Id: t3.c,v 1.12 2004-10-29 13:02:39 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -20,42 +20,24 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-#include <yaz/log.h>
-#include <yaz/pquery.h>
-#include <idzebra/api.h>
+/* Creates a few result sets */
+
+#include "testlib.h"
+
+const char *myrec[] ={
+        "<gils>\n"
+        "  <title>My title</title>\n"
+        "</gils>\n",
+        0};
 
-/* 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);
-}
 	
 int main(int argc, char **argv)
 {
     int i;
-    ZebraService zs;
-    ZebraHandle zh;
-    const char *myrec =
-        "<gils>\n"
-        "  <title>My title</title>\n"
-        "</gils>\n";
-
-    yaz_log_init_file("t3.log");
-     yaz_log_init_level(LOG_ALL);
-
-    nmem_init ();
-    
-    zs = start_service();
-    zh = zebra_open (zs);
-    zebra_select_database(zh, "Default");
-    zebra_init(zh);
+    ZebraService zs = start_up(0, argc, argv);
+    ZebraHandle  zh = zebra_open (zs);
 
-    zebra_begin_trans (zh, 1);
-    zebra_add_record (zh, myrec, strlen(myrec));
-    zebra_end_trans (zh);
+    init_data(zh,myrec);
 
     for (i = 0; i<4; i++)
     {
@@ -81,6 +63,7 @@ int main(int argc, char **argv)
         zebra_end_trans (zh);
         yaz_pqf_destroy(parser);
 #if 0
+        /*FIXME Why is this disabled ??? */
         zebra_records_retrieve (zh, odr_output, setname, 0,
                                 VAL_TEXT_XML, 1, &retrievalRecord);
 #endif
@@ -92,10 +75,6 @@ int main(int argc, char **argv)
         odr_destroy (odr_output);
     }
     zebra_commit (zh);
-    zebra_close (zh);
-    zebra_stop (zs);
 
-    nmem_exit ();
-    xmalloc_trav ("x");
-    exit (0);
+    return close_down(zh,zs,0);
 }