X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft3.c;h=8164a0de597f3f8d3c4c5a8f9eea729d99828857;hb=51e194ae762d9b2b15fcc088e5f4005029f78f60;hp=771b95c8268af7a0e588bdf0009e0f3eb748afd2;hpb=6059368fdd11d7671beb904d6a4c6c98871e489c;p=idzebra-moved-to-github.git

diff --git a/test/api/t3.c b/test/api/t3.c
index 771b95c..8164a0d 100644
--- a/test/api/t3.c
+++ b/test/api/t3.c
@@ -1,6 +1,6 @@
-/* $Id: t3.c,v 1.1 2003-05-19 21:37:38 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: t3.c,v 1.17 2005-04-15 10:47:49 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,34 +20,27 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
+/* Creates a few result sets */
 
-#include <yaz/pquery.h>
-#include <zebraapi.h>
+#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";
-    nmem_init ();
-    
-    zs = zebra_start("t2.cfg");
-    zh = zebra_open (zs);
-    zebra_select_database(zh, "Default");
+    ZebraService zs = start_up(0, argc, argv);
+    ZebraHandle zh = zebra_open(zs);
 
-    zebra_begin_trans (zh, 1);
-    zebra_record_insert (zh, myrec, strlen(myrec));
-    zebra_end_trans (zh);
+    init_data(zh, myrec);
 
     for (i = 0; i<4; i++)
     {
-#if 0
-        ZebraRetrievalRecord retrievalRecord;
-#endif
         char setname[20];
         char *setnamep = setname;
         int status;
@@ -56,32 +49,22 @@ int main(int argc, char **argv)
         YAZ_PQF_Parser parser = yaz_pqf_create();
         Z_RPNQuery *query = yaz_pqf_parse(parser, odr_input, 
                                           "@attr 1=4 my");
-        int hits;
+        zint hits;
         zebra_begin_trans (zh, 1);
         zebra_begin_trans (zh, 0);
         
         sprintf(setname, "s%d", i+1);
-        zebra_search_rpn (zh, odr_input, odr_output, query, setname, &hits);
+        zebra_search_RPN (zh, odr_input, query, setname, &hits);
 
         zebra_end_trans (zh);
         zebra_end_trans (zh);
         yaz_pqf_destroy(parser);
-#if 0
-        zebra_records_retrieve (zh, odr_output, setname, 0,
-                                VAL_TEXT_XML, 1, &retrievalRecord);
-#endif
-#if 1
-        zebra_deleleResultSet(zh, Z_DeleteRequest_list,
+        zebra_deleteResultSet(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);
 }