Happy new year

[idzebra-moved-to-github.git] / test / marcxml / t1.c

diff --git a/test/marcxml/t1.c b/test/marcxml/t1.c
index 9b4aa64..e516c4b 100644 (file)
--- a/test/marcxml/t1.c
+++ b/test/marcxml/t1.c
@@ -1,8 +1,5 @@
-/* $Id: t1.c,v 1.6 2005-09-13 11:51:08 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -15,37 +12,60 @@ 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
+
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "testlib.h"
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
-    ZebraService zs = start_up(0, argc, argv);
+    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));
+
+    YAZ_CHECK(tl_query(zh, "@attr 1=leader 00366", 2));
+    YAZ_CHECK(tl_query(zh, "@attr 1=leader2 nam", 2));
+    YAZ_CHECK(tl_query(zh, "@attr 1=1003 jack", 2));
+    YAZ_CHECK(tl_query(zh, "@attr 1=1003 jack", 2));
+    YAZ_CHECK(tl_query(zh, "@attr 1=1003 collins", 2));
+    YAZ_CHECK(tl_query(zh, "@attr 1=1003 @attr 3=1 collins", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 3=1 program", 0));
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 3=1 to", 0));
 
-    return close_down(zh, zs, 0);
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
+
+TL_MAIN
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+