Put local variables footer in all c, h files.

[idzebra-moved-to-github.git] / test / api / t3.c

diff --git a/test/api/t3.c b/test/api/t3.c
index be6188e..ac7e6bd 100644 (file)
--- 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.20 2006-05-10 08:13:35 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,47 +20,26 @@ 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 */
 
-/* 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 =
+#include "testlib.h"
+
+const char *myrec[] ={
         "<gils>\n"
         "  <title>My title</title>\n"
-        "</gils>\n";
-
-    yaz_log_init_file("t3.log");
+        "</gils>\n",
+        0};
 
-    nmem_init ();
-    
-    zs = start_service();
-    zh = zebra_open (zs);
-    zebra_select_database(zh, "Default");
-    zebra_init(zh);
+static void tst(int argc, char **argv)
+{
+    int i;
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle zh = zebra_open(zs, 0);
 
-    zebra_begin_trans (zh, 1);
-    zebra_add_record (zh, myrec, strlen(myrec));
-    zebra_end_trans (zh);
+    YAZ_CHECK(tl_init_data(zh, myrec));
 
     for (i = 0; i<4; i++)
     {
-#if 0
-        ZebraRetrievalRecord retrievalRecord;
-#endif
         char setname[20];
         char *setnamep = setname;
         int status;
@@ -69,32 +48,49 @@ 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;
-        zebra_begin_trans (zh, 1);
-        zebra_begin_trans (zh, 0);
+        zint hits;
+        if (zebra_begin_trans (zh, 1) != ZEBRA_OK)
+       {
+           fprintf(stderr, "zebra_begin_trans failed\n");
+           exit(1);
+       }
+        if (zebra_begin_trans (zh, 0) != ZEBRA_OK)
+       {
+           fprintf(stderr, "zebra_begin_trans failed\n");
+           exit(1);
+       }
         
         sprintf(setname, "s%d", i+1);
         zebra_search_RPN (zh, odr_input, query, setname, &hits);
 
-        zebra_end_trans (zh);
-        zebra_end_trans (zh);
+        if (zebra_end_trans (zh) != ZEBRA_OK)
+       {
+           fprintf(stderr, "zebra_end_trans failed\n");
+           exit(1);
+       }
+        if (zebra_end_trans (zh) != ZEBRA_OK)
+       {
+           fprintf(stderr, "zebra_end_trans failed\n");
+           exit(1);
+       }
         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);
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
+
+TL_MAIN
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+