X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft3.c;h=16da4d87315e7e11a5d70fa847d8b803e007588f;hb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;hp=be6188e772c5b95b020b30b0611fbe483d457e31;hpb=ec214819d7b9e2f5c362584d8e38f83e13aae600;p=idzebra-moved-to-github.git

diff --git a/test/api/t3.c b/test/api/t3.c
index be6188e..16da4d8 100644
--- a/test/api/t3.c
+++ b/test/api/t3.c
@@ -1,6 +1,6 @@
-/* $Id: t3.c,v 1.9 2004-08-25 09:23:39 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: t3.c,v 1.14 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,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");
-
-    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++)
     {
@@ -80,21 +63,18 @@ int main(int argc, char **argv)
         zebra_end_trans (zh);
         yaz_pqf_destroy(parser);
 #if 0
-        zebra_records_retrieve (zh, odr_output, setname, 0,
-                                VAL_TEXT_XML, 1, &retrievalRecord);
+        /*FIXME Why is this disabled ??? */
+        zebra_records_retrieve(zh, odr_output, setname, 0,
+			       VAL_TEXT_XML, 1, &retrievalRecord);
 #endif
 #if 1
         zebra_deleleResultSet(zh, Z_DeleteRequest_list,
                               1, &setnamep, &status);
 #endif
-        odr_destroy (odr_input);
-        odr_destroy (odr_output);
+        odr_destroy(odr_input);
+        odr_destroy(odr_output);
     }
-    zebra_commit (zh);
-    zebra_close (zh);
-    zebra_stop (zs);
+    zebra_commit(zh);
 
-    nmem_exit ();
-    xmalloc_trav ("x");
-    exit (0);
+    return close_down(zh, zs, 0);
 }