From 6553d554c426c2184c02a287b77f9e24ae70fdc1 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 14 Dec 2004 11:23:32 +0000
Subject: [PATCH] Check for filter grs.xml when appropriate

---
 test/charmap/charmap1.c |    4 +++-
 test/espec/t1.c         |   23 +++--------------------
 test/marcxml/t1.c       |    3 ++-
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/test/charmap/charmap1.c b/test/charmap/charmap1.c
index 1ef2269..95c374e 100644
--- a/test/charmap/charmap1.c
+++ b/test/charmap/charmap1.c
@@ -1,4 +1,4 @@
-/* $Id: charmap1.c,v 1.1 2004-12-02 13:59:08 adam Exp $
+/* $Id: charmap1.c,v 1.2 2004-12-14 11:23:32 adam Exp $
    Copyright (C) 2003,2004
    Index Data Aps
 
@@ -28,6 +28,8 @@ int main(int argc, char **argv)
     ZebraHandle  zh = zebra_open(zs);
     char path[256];
 
+    check_filter(zs, "grs.xml");
+
     zebra_select_database(zh, "Default");
 
     zebra_init(zh);
diff --git a/test/espec/t1.c b/test/espec/t1.c
index c74b743..d2e5a9d 100644
--- a/test/espec/t1.c
+++ b/test/espec/t1.c
@@ -1,4 +1,4 @@
-/* $Id: t1.c,v 1.1 2004-12-14 09:47:55 adam Exp $
+/* $Id: t1.c,v 1.2 2004-12-14 11:23:32 adam Exp $
    Copyright (C) 2003,2004
    Index Data Aps
 
@@ -30,6 +30,8 @@ int main(int argc, char **argv)
     char path[256];
     int i, errs = 0;
 
+    check_filter(zs, "grs.xml");
+
     zebra_select_database(zh, "Default");
 
     zebra_init(zh);
@@ -46,25 +48,6 @@ int main(int argc, char **argv)
     do_query(__LINE__,zh, "@attr 1=1016 X2", 1);
     do_query(__LINE__,zh, "@attr 1=1016 {X2 X3}", 1);
 
-#if 0
-    recs = zebra_meta_records_create_range (zh, "rsetname", 1, 4);
-    if (!recs)
-    {
-	fprintf(stderr, "recs==0\n");
-	exit(1);
-    }
-    if (recs[0].sysno != 3)
-	errs++;
-    if (recs[1].sysno != 2)
-	errs++;
-    if (recs[2].sysno != 4)
-	errs++;
-    if (recs[3].sysno != 5)
-	errs++;
-
-    zebra_meta_records_destroy (zh, recs, 4);
-#endif
-
     if (errs)
     {
 	fprintf(stderr, "%d sysnos did not match\n", errs);
diff --git a/test/marcxml/t1.c b/test/marcxml/t1.c
index 6bc76af..9d51961 100644
--- a/test/marcxml/t1.c
+++ b/test/marcxml/t1.c
@@ -1,4 +1,4 @@
-/* $Id: t1.c,v 1.2 2004-12-02 14:05:04 adam Exp $
+/* $Id: t1.c,v 1.3 2004-12-14 11:23:32 adam Exp $
    Copyright (C) 2003,2004
    Index Data Aps
 
@@ -28,6 +28,7 @@ int main(int argc, char **argv)
     ZebraHandle  zh = zebra_open(zs);
     char path[256];
 
+    check_filter(zs, "grs.xml");
     zebra_select_database(zh, "Default");
 
     zebra_init(zh);
-- 
1.7.10.4