X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fmarcxml%2Ft2.c;h=19378b4a5f0c0deb641c49338a37b2342e59d1c1;hb=6c5eead59b04271013219c4e71b3a1314ced4957;hp=5e98f33f083d7df5dd167287aabf2d9add4b8233;hpb=a34c87ac6c08ec62534e4068a5bd1fac93df8abe;p=idzebra-moved-to-github.git

diff --git a/test/marcxml/t2.c b/test/marcxml/t2.c
index 5e98f33..19378b4 100644
--- a/test/marcxml/t2.c
+++ b/test/marcxml/t2.c
@@ -1,6 +1,6 @@
-/* $Id: t2.c,v 1.2 2004-12-02 14:05:04 adam Exp $
-   Copyright (C) 2003,2004
-   Index Data Aps
+/* $Id: t2.c,v 1.6 2006-03-31 15:58:08 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,28 +20,30 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-#include "../api/testlib.h"
+#include "testlib.h"
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
-    ZebraService zs = start_up(0, argc, argv);
-    ZebraHandle zh = zebra_open(zs);
+    ZebraService zs = tl_start_up(0, argc, argv);
+    ZebraHandle zh = zebra_open(zs, 0);
     char path[256];
 
-    zebra_select_database(zh, "Default");
+    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
 
     zebra_init(zh);
 
     zebra_set_resource(zh, "recordType", "grs.marcxml.record");
     
-    zebra_begin_trans(zh, 1);
+    YAZ_CHECK(zebra_begin_trans(zh, 1) == ZEBRA_OK);
 
-    sprintf(path, "%.200s/sample-marc", get_srcdir());
+    sprintf(path, "%.200s/sample-marc", tl_get_srcdir());
     zebra_repository_update(zh, path);
-    zebra_end_trans(zh);
+    YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
     zebra_commit(zh);
 
-    do_query(__LINE__,zh, "@and @attr 1=1003 jack @attr 1=4 computer", 2);
+    YAZ_CHECK(tl_query(zh, "@and @attr 1=1003 jack @attr 1=4 computer", 2));
 
-    return close_down(zh, zs, 0);
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
+
+TL_MAIN