X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft4.c;h=820ec362af6af69d053910822458883f2bdc94df;hb=ccabffc112ba33841d636522046c9ce4f02152c2;hp=cb56b2ad464971ed554cd09a857b1e6aec3e8253;hpb=ec214819d7b9e2f5c362584d8e38f83e13aae600;p=idzebra-moved-to-github.git

diff --git a/test/api/t4.c b/test/api/t4.c
index cb56b2a..820ec36 100644
--- a/test/api/t4.c
+++ b/test/api/t4.c
@@ -1,6 +1,6 @@
-/* $Id: t4.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: t4.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,47 +20,33 @@ 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>
+/* t4 - insert a small pile of records, search and fetch them */
 
-/* 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);
-}
+#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";
-
-    yaz_log_init_file("t4.log");
+    ZebraService zs = start_up(0, argc, argv);
+    ZebraHandle zh = zebra_open(zs);
 
-    nmem_init ();
-    
-    zs = start_service();
-    zh = zebra_open (zs);
-    zebra_init(zh);
-    zebra_select_database(zh, "Default");
+    init_data(zh, myrec);
 
     zebra_begin_trans (zh, 1);
     for (i = 0; i<1200; i++)
-	zebra_add_record (zh, myrec, strlen(myrec));
-    zebra_end_trans (zh);
+	zebra_add_record(zh, myrec[0], strlen(myrec[0]));
+    zebra_end_trans(zh);
     zebra_close(zh);
     zebra_stop(zs);
 
-    zs = start_service();
-    zh = zebra_open (zs);
+    zs = start_service("");
+    zh = zebra_open(zs);
     zebra_select_database(zh, "Default");
 
     for (i = 0; i<2; i++)
@@ -68,39 +54,34 @@ int main(int argc, char **argv)
         ZebraRetrievalRecord retrievalRecord[1001];
         char setname[20];
         int j;
-        ODR odr_input = odr_createmem (ODR_DECODE);    
-        ODR odr_output = odr_createmem (ODR_DECODE);    
+        ODR odr_input = odr_createmem(ODR_DECODE);    
+        ODR odr_output = odr_createmem(ODR_DECODE);    
         YAZ_PQF_Parser parser = yaz_pqf_create();
         Z_RPNQuery *query = yaz_pqf_parse(parser, odr_input, 
                                           "@attr 1=4 my");
         int hits;
         
         sprintf(setname, "s%d", i+1);
-        zebra_search_RPN (zh, odr_input, query, setname, &hits);
+        zebra_search_RPN(zh, odr_input, query, setname, &hits);
 
         yaz_pqf_destroy(parser);
 
-        odr_destroy (odr_input);
+        odr_destroy(odr_input);
 
-        zebra_begin_trans (zh, 1);
+        zebra_begin_trans(zh, 1);
 
 	for (j = 0; j<1001; j++)
 	    retrievalRecord[j].position = j+1;
 
-        zebra_records_retrieve (zh, odr_output, setname, 0,
-                                VAL_TEXT_XML, 1001, retrievalRecord);
-
+        zebra_records_retrieve(zh, odr_output, setname, 0,
+			       VAL_TEXT_XML, 1001, retrievalRecord);
+	
 
-        odr_destroy (odr_output);
+        odr_destroy(odr_output);
 
-        zebra_end_trans (zh);
+        zebra_end_trans(zh);
 
     }
-    zebra_commit (zh);
-    zebra_close (zh);
-    zebra_stop (zs);
-
-    nmem_exit ();
-    xmalloc_trav ("x");
-    exit (0);
+    zebra_commit(zh);
+    return close_down(zh, zs, 0);
 }