X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft4.c;h=b38a9a5fa9df44b132e1b3ef7854ff9b601a19e5;hb=e172ced0dcc937dfc433a33c7e20962b9e6b5ea0;hp=9ab82e96379d36fb125e839d1bd9a9ceb6994d6d;hpb=58e3c5132f9fe86fefbf2e130275ab9980eeed1e;p=idzebra-moved-to-github.git

diff --git a/test/api/t4.c b/test/api/t4.c
index 9ab82e9..b38a9a5 100644
--- a/test/api/t4.c
+++ b/test/api/t4.c
@@ -1,5 +1,5 @@
-/* $Id: t4.c,v 1.1 2003-06-18 11:46:34 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: t4.c,v 1.11 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,40 +20,36 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-#include <yaz/log.h>
-#include <yaz/pquery.h>
-#include <zebraapi.h>
+/* t4 - insert a small pile of records, search and fetch them */
 
+#include "testlib.h"
+
+const char *myrec[] = {
+        "<gils>\n"
+        "  <title>My title</title>\n"
+        "</gils>\n",
+        0};
+	
 int main(int argc, char **argv)
 {
     int i;
-    ZebraService zs;
-    ZebraHandle zh;
-    const char *myrec =
-        "<gils>\n"
-        "  <title>My title</title>\n"
-        "</gils>\n";
+    ZebraService zs = start_up(0, argc, argv);;
+    ZebraHandle zh = zebra_open (zs);
 
-    yaz_log_init_file("t3.log");
-
-    nmem_init ();
-    
-    zs = zebra_start("t2.cfg");
-    zh = zebra_open (zs);
-    zebra_select_database(zh, "Default");
+    init_data(zh,myrec);
 
     zebra_begin_trans (zh, 1);
     for (i = 0; i<1200; i++)
-	zebra_record_insert (zh, myrec, strlen(myrec));
+	zebra_add_record (zh, myrec[0], strlen(myrec[0]));
     zebra_end_trans (zh);
     zebra_close(zh);
     zebra_stop(zs);
 
-    zs = zebra_start("t2.cfg");
+    zs = start_service("");
     zh = zebra_open (zs);
     zebra_select_database(zh, "Default");
 
-    for (i = 0; i<4; i++)
+    for (i = 0; i<2; i++)
     {
         ZebraRetrievalRecord retrievalRecord[1001];
         char setname[20];
@@ -68,8 +64,6 @@ int main(int argc, char **argv)
         sprintf(setname, "s%d", i+1);
         zebra_search_RPN (zh, odr_input, query, setname, &hits);
 
-	printf ("hits=%d\n", hits);
-
         yaz_pqf_destroy(parser);
 
         odr_destroy (odr_input);
@@ -89,10 +83,5 @@ int main(int argc, char **argv)
 
     }
     zebra_commit (zh);
-    zebra_close (zh);
-    zebra_stop (zs);
-
-    nmem_exit ();
-    xmalloc_trav ("x");
-    exit (0);
+    return close_down(zh,zs,0);
 }