X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft11.c;h=f6038dc31011096b134a42166d5bf2fe44691f33;hb=1922579d92e1a9559d4c3ab4f1cf461f56c83c3b;hp=79660e103097138721afaa3cae712a0943c9140f;hpb=4478d785b7769691261005c98063b98a5a5971b3;p=idzebra-moved-to-github.git

diff --git a/test/api/t11.c b/test/api/t11.c
index 79660e1..f6038dc 100644
--- a/test/api/t11.c
+++ b/test/api/t11.c
@@ -1,8 +1,5 @@
-/* $Id: t11.c,v 1.6 2006-08-14 10:40:22 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) 1995-2008 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
@@ -38,90 +35,126 @@ static void tst(int argc, char **argv)
 
     YAZ_CHECK(tl_init_data(zh, myrec));
 
-    if (1)
+    /*
+      int tl_scan
+      (
+      ZebraHandle zh, const char *query,
+      int pos, int num,
+      int exp_pos, int exp_num, int exp_partial,
+      const char **exp_entries
+      )
+    */
+
+
+    {
+	/* bad string use attrite, bug #647 */
+	YAZ_CHECK(tl_scan(zh, "@attr 1=bad 0", 1, 1, 1, 1, 0, 0));
+    }
+
+    {
+	/* bad numeric use attributes, bug #647 */
+	YAZ_CHECK(tl_scan(zh, "@attr 1=1234 0", 1, 1, 1, 1, 0, 0));
+    }
+
     {
 	/* scan before. nothing must be returned */
 	const char *ent[] = { "a", 0 };
 	YAZ_CHECK(tl_scan(zh, "@attr 1=4 0", 1, 1, 1, 1, 0, ent));
     }
-    if (1)
+
     {
 	/* scan after. nothing must be returned */
-	YAZ_CHECK(tl_scan(zh, "@attr 1=4 m", 1, 1, 1, 0, 1, 0));
+	const char *ent[] = { 0 };
+	YAZ_CHECK(tl_scan(zh, "@attr 1=4 m", 1, 1, 1, 0, 1, ent));
     }
-    if (1)
+
     {
 	const char *ent[] = { "a", 0 };
 	YAZ_CHECK(tl_scan(zh, "@attr 1=4 a", 1, 1, 1, 1, 0, ent));
     }
-    if (1)
+
     {
 	const char *ent[] = { "b", "c", 0 };
 	YAZ_CHECK(tl_scan(zh, "@attr 1=4 aa", 1, 2, 1, 2, 0, ent));
     }
-    if (1)
+
     {
 	const char *ent[] = { "b", "c", 0 };
 	YAZ_CHECK(tl_scan(zh, "@attr 1=4 aa", 1, 2, 1, 2, 0, ent));
     }
-    if (1)
+
     {
 	const char *ent[] = { "e", "f", 0 };
 	YAZ_CHECK(tl_scan(zh, "@attr 1=4 e", 1, 3, 1, 2, 1, ent));
     }
-    if (1)
+
     {
 	const char *ent[] = { "c", "d", 0 };
 	YAZ_CHECK(tl_scan(zh, "@attr 1=4 a", -1, 2, -1, 2, 0, ent));
     }
-    if (1)
+
     {
 	const char *ent[] = { "d", 0 };
 	YAZ_CHECK(tl_scan(zh, "@attr 1=4 a", -2, 1, -2, 1, 0, ent));
     }
-    if (1)
+
     {
 	const char *ent[] = { "f", 0 };
 	YAZ_CHECK(tl_scan(zh, "@attr 1=4 a", -4, 1, -4, 1, 0, ent));
     }
-    if (1)
+
     {
 	const char *ent[] = { "f", 0 };
 	YAZ_CHECK(tl_scan(zh, "@attr 1=4 a", -5, 1, -5, 0, 1, ent));
     }
-    if (1)
+
     {
 	const char *ent[] = { "d", "e", "f", 0 };
 	YAZ_CHECK(tl_scan(zh, "@attr 1=4 a", -2, 3, -2, 3, 0, ent));
     }
-    if (1)
+
     {
 	const char *ent[] = { "d", "e", "f", 0 };
 	YAZ_CHECK(tl_scan(zh, "@attr 1=4 a", -2, 4, -2, 3, 1, ent));
     }
-    if (1)
+
     {
 	const char *ent[] = { "a", "b", "c", "d", "e", "f", 0 };
 	YAZ_CHECK(tl_scan(zh, "@attr 1=4 0", 2, 100, 1, 6, 1, ent));
     }
-    if (1)
+
     {
 	const char *ent[] = { "b", "c", "d", "e", "f", 0 };
 	YAZ_CHECK(tl_scan(zh, "@attr 1=4 0", 0, 100, 0, 5, 1, ent));
     }
-    if (1)
+
     {
 	const char *ent[] = { "a", "b", "c", "d", "e", "f", 0 };
 	YAZ_CHECK(tl_scan(zh, "@attr 1=4 0", 10, 100, 1, 6, 1, ent));
     }
-    if (1)
+
     {
 	const char *ent[] = { "a", "b", "c", "d", "e", "f", 0 };
 	YAZ_CHECK(tl_scan(zh, "@attr 1=4 0", 22, 10, 1, 0, 1, ent));
     }
-    if (1)
+
+    {
+	const char *ent[] = { 0 };
+	YAZ_CHECK(tl_scan(zh, "@attr 1=4 z", -22, 10, -22, 0, 1, ent));
+    }
+
     {
-	YAZ_CHECK(tl_scan(zh, "@attr 1=4 z", -22, 10, -22, 0, 1, 0));
+	const char *ent[] = { "c", "d", 0 };
+
+        YAZ_CHECK(tl_query(zh, "@attr 1=4 c", 1));
+
+        /* must fail, because x is not a result set */
+	YAZ_CHECK(tl_scan(zh, "@attr 8=x @attr 1=4 a", 1, 3, 0, 0, 0, 0));
+
+        /* bug 1114 */
+	YAZ_CHECK(tl_scan(zh, "@attr 8=rsetname @attr 1=4 0",
+                          1, 20, 1, 2, 1, ent));
+
     }
     YAZ_CHECK(tl_close_down(zh, zs));
 }