Bump year. Change Aps->ApS

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

diff --git a/test/api/t2.c b/test/api/t2.c
index 7a93156..6f98f18 100644 (file)
--- a/test/api/t2.c
+++ b/test/api/t2.c
@@ -1,6 +1,6 @@
-/* $Id: t2.c,v 1.11 2004-07-28 08:15:47 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: t2.c,v 1.16 2005-01-15 19:38:35 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,55 +20,21 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-#include <stdlib.h>
-#include <yaz/log.h>
-#include <zebraapi.h>
+#include "testlib.h"
 
-/* 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 exit_code = 0;
-    int hits;
-    ZebraService zs;
-    ZebraHandle zh;
-    const char *myrec =
+const char *myrec[] = {
         "<gils>\n"
         "  <title>My title</title>\n"
-        "</gils>\n";
-
-    yaz_log_init_file("t2.log");
+        "</gils>\n",
+        0};
 
-    nmem_init ();
-
-    zs = start_service();
-    zh = zebra_open (zs);
-    zebra_select_database(zh, "Default");
-    zebra_init(zh);
-    zebra_begin_trans (zh, 1);
-
-    zebra_add_record (zh, myrec, strlen(myrec));
-
-    zebra_search_PQF (zh, "@attr 1=4 my", "set1", &hits);
-    if (hits != 1)
-    {
-        yaz_log(LOG_FATAL, "Expected 1 hit. Got %d", hits);
-        exit_code = 1;
-    }
+int main(int argc, char **argv)
+{
+    ZebraService zs = start_up(0, argc, argv);
+    ZebraHandle  zh = zebra_open(zs);
 
-    zebra_end_trans (zh);
-    zebra_commit (zh);
-    zebra_close (zh);
-    zebra_stop (zs);
+    init_data(zh, myrec);
+    do_query(__LINE__,zh, "@attr 1=4 my", 1);
 
-    nmem_exit ();
-    xmalloc_trav ("x");
-    exit (exit_code);
+    return close_down(zh, zs, 0);
 }