X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fmarcxml%2Ft1.c;h=f4f612507453ba8d2b7a579521bd3cb15223ee71;hb=7415d28c149c1bab51fe93aeaccdd14085b69bd9;hp=36a9c4d853021cca594ad785a3e79c21585dbb7e;hpb=0f3b8bcc6fe2e3beeec7c834d9a64dca48a4f1b7;p=idzebra-moved-to-github.git

diff --git a/test/marcxml/t1.c b/test/marcxml/t1.c
index 36a9c4d..f4f6125 100644
--- a/test/marcxml/t1.c
+++ b/test/marcxml/t1.c
@@ -1,4 +1,4 @@
-/* $Id: t1.c,v 1.5 2005-04-28 08:20:41 adam Exp $
+/* $Id: t1.c,v 1.8 2006-05-10 08:13:36 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -22,30 +22,40 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #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];
 
-    check_filter(zs, "grs.xml");
-    zebra_select_database(zh, "Default");
+    tl_check_filter(zs, "grs.xml");
+    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
 
     zebra_init(zh);
 
-    zebra_begin_trans(zh, 1);
-    sprintf(path, "%.200s/m1.xml", get_srcdir());
+    YAZ_CHECK(zebra_begin_trans(zh, 1) == ZEBRA_OK);
+    sprintf(path, "%.200s/m1.xml", tl_get_srcdir());
     zebra_repository_update(zh, path);
-    sprintf(path, "%.200s/m2.xml", get_srcdir());
+    sprintf(path, "%.200s/m2.xml", tl_get_srcdir());
     zebra_repository_update(zh, path);
-    sprintf(path, "%.200s/m3.xml", get_srcdir());
+    sprintf(path, "%.200s/m3.xml", 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 "
+    
+    YAZ_CHECK(tl_query(zh, "@and "
 	     "@attr 1=54 eng "
-	     "@and @attr 1=1003 jack @attr 1=4 computer", 2);
+	     "@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
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+