X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft2.c;h=fd7cf5bffbbc1fa6eefb07f59b7c549472e6bf5e;hb=03cd7d7f298324b3cc7185de7e9c65eab79c5048;hp=c911a311dc32534f8bd4c846b5189785ffb92a7c;hpb=91cd9a822677f6ccaac0a5445d1781d10180460f;p=idzebra-moved-to-github.git

diff --git a/test/api/t2.c b/test/api/t2.c
index c911a31..fd7cf5b 100644
--- a/test/api/t2.c
+++ b/test/api/t2.c
@@ -1,6 +1,6 @@
-/* $Id: t2.c,v 1.9 2004-06-14 21:43:44 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: t2.c,v 1.22 2007-01-15 15:10:20 adam Exp $
+   Copyright (C) 1995-2007
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -15,50 +15,42 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
-#include <yaz/log.h>
-#include <zebraapi.h>
+#include "testlib.h"
 
-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");
-
-    nmem_init ();
+        "</gils>\n",
+        0};
 
-    zs = zebra_start("zebra.cfg", 0, 0);
-    zh = zebra_open (zs);
-    zebra_select_database(zh, "Default");
-    zebra_init(zh);
-    zebra_begin_trans (zh, 1);
-
-    zebra_add_record (zh, myrec, strlen(myrec));
+void tst(int argc, char **argv)
+{
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle  zh = zebra_open(zs, 0);
+
+    YAZ_CHECK(tl_init_data(zh, myrec));
+    YAZ_CHECK(tl_query(zh, "@attr 1=title my", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 my", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=title nope", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 nope", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 1=title @attr 2=103 dummy", 1));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=103 dummy", 1));
+
+    YAZ_CHECK(tl_close_down(zh, zs));
+}
 
-    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;
-    }
+TL_MAIN
 
-    zebra_end_trans (zh);
-    zebra_commit (zh);
-    zebra_close (zh);
-    zebra_stop (zs);
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
 
-    nmem_exit ();
-    xmalloc_trav ("x");
-    exit (exit_code);
-}