X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fmarcxml%2Ft2.c;h=7e956806c88ffdba179a326fbff66e7febf1fe67;hb=20e2d608e0cd383054e627db00264388affb58cd;hp=e0f140ea27f11fb9416783a31a3518868d690dfd;hpb=422279f19e20343e71a46c5505696b2efa455b60;p=idzebra-moved-to-github.git

diff --git a/test/marcxml/t2.c b/test/marcxml/t2.c
index e0f140e..7e95680 100644
--- a/test/marcxml/t2.c
+++ b/test/marcxml/t2.c
@@ -1,8 +1,5 @@
-/* $Id: t2.c,v 1.9 2006-08-22 08:11:32 adam Exp $
-   Copyright (C) 1995-2006
-   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
@@ -20,6 +17,9 @@ 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,10 +41,19 @@ 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));
 }
@@ -53,6 +62,7 @@ TL_MAIN
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab