X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fmarcxml%2Ft2.c;h=73f6b076040bd427beee5890d1060a6eec77c5de;hb=e4c6861efeeea654bfb00c5f0239ee258629d77f;hp=19378b4a5f0c0deb641c49338a37b2342e59d1c1;hpb=74fdf8a15af7bb827a256d9df3ecc34a57d2120f;p=idzebra-moved-to-github.git

diff --git a/test/marcxml/t2.c b/test/marcxml/t2.c
index 19378b4..73f6b07 100644
--- a/test/marcxml/t2.c
+++ b/test/marcxml/t2.c
@@ -1,8 +1,5 @@
-/* $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.
+/* This file is part of the Zebra server.
+   Copyright (C) 2004-2013 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,11 +12,14 @@ 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"
 
 static void tst(int argc, char **argv)
@@ -33,7 +33,7 @@ static void tst(int argc, char **argv)
     zebra_init(zh);
 
     zebra_set_resource(zh, "recordType", "grs.marcxml.record");
-    
+
     YAZ_CHECK(zebra_begin_trans(zh, 1) == ZEBRA_OK);
 
     sprintf(path, "%.200s/sample-marc", tl_get_srcdir());
@@ -41,9 +41,30 @@ static void tst(int argc, char **argv)
     YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
     zebra_commit(zh);
 
-    YAZ_CHECK(tl_query(zh, "@and @attr 1=1003 jack @attr 1=4 computer", 2));
+
+    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
+ */
+