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

diff --git a/test/marcxml/t2.c b/test/marcxml/t2.c
index 5e98f33..7bb40dd 100644
--- a/test/marcxml/t2.c
+++ b/test/marcxml/t2.c
@@ -1,8 +1,5 @@
-/* $Id: t2.c,v 1.2 2004-12-02 14:05:04 adam Exp $
-   Copyright (C) 2003,2004
-   Index Data Aps
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 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,33 +12,59 @@ 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 "../api/testlib.h"
+#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);
-    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);
 
-    return close_down(zh, zs, 0);
+    YAZ_CHECK(tl_query(zh, "@and "
+	     "@attr 1=54 eng "
+	     "@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", 12));
+    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));
+
+    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
+ */
+