X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft11.c;h=cf286c6ea0847b18ab65a7a2961296c1592c1cf3;hb=74fdf8a15af7bb827a256d9df3ecc34a57d2120f;hp=0ce4e899b4befed63145fdcde2d100a091ae7ee4;hpb=f24d7d2fd56ec639ccd0d9c2f9628964ef72c078;p=idzebra-moved-to-github.git

diff --git a/test/api/t11.c b/test/api/t11.c
index 0ce4e89..cf286c6 100644
--- a/test/api/t11.c
+++ b/test/api/t11.c
@@ -1,4 +1,4 @@
-/* $Id: t11.c,v 1.1 2005-05-02 09:05:22 adam Exp $
+/* $Id: t11.c,v 1.4 2006-03-31 15:58:05 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -29,87 +29,102 @@ const char *myrec[] = {
         "<gils>\n<title>e f</title>\n</gils>\n" ,
 	0} ;
 	
-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);
 
-    init_data(zh, myrec);
+    YAZ_CHECK(zh);
+
+    YAZ_CHECK(tl_init_data(zh, myrec));
 
     if (1)
     {
 	/* scan before. nothing must be returned */
 	const char *ent[] = { "a", 0 };
-	do_scan(__LINE__, zh, "@attr 1=4 0", 1, 1, 1, 1, 0, ent);
+	YAZ_CHECK(tl_scan(zh, "@attr 1=4 0", 1, 1, 1, 1, 0, ent));
     }
     if (1)
     {
 	/* scan after. nothing must be returned */
-	do_scan(__LINE__, zh, "@attr 1=4 m", 1, 1, 1, 0, 1, 0);
+	YAZ_CHECK(tl_scan(zh, "@attr 1=4 m", 1, 1, 1, 0, 1, 0));
     }
     if (1)
     {
 	const char *ent[] = { "a", 0 };
-	do_scan(__LINE__, zh, "@attr 1=4 a", 1, 1, 1, 1, 0, ent);
+	YAZ_CHECK(tl_scan(zh, "@attr 1=4 a", 1, 1, 1, 1, 0, ent));
     }
     if (1)
     {
 	const char *ent[] = { "b", "c", 0 };
-	do_scan(__LINE__, zh, "@attr 1=4 aa", 1, 2, 1, 2, 0, ent);
+	YAZ_CHECK(tl_scan(zh, "@attr 1=4 aa", 1, 2, 1, 2, 0, ent));
     }
     if (1)
     {
 	const char *ent[] = { "b", "c", 0 };
-	do_scan(__LINE__, zh, "@attr 1=4 aa", 1, 2, 1, 2, 0, ent);
+	YAZ_CHECK(tl_scan(zh, "@attr 1=4 aa", 1, 2, 1, 2, 0, ent));
     }
     if (1)
     {
 	const char *ent[] = { "e", "f", 0 };
-	do_scan(__LINE__, zh, "@attr 1=4 e", 1, 3, 1, 2, 1, ent);
+	YAZ_CHECK(tl_scan(zh, "@attr 1=4 e", 1, 3, 1, 2, 1, ent));
     }
     if (1)
     {
 	const char *ent[] = { "c", "d", 0 };
-	do_scan(__LINE__, zh, "@attr 1=4 a", -1, 2, -1, 2, 0, ent);
+	YAZ_CHECK(tl_scan(zh, "@attr 1=4 a", -1, 2, -1, 2, 0, ent));
     }
     if (1)
     {
 	const char *ent[] = { "d", 0 };
-	do_scan(__LINE__, zh, "@attr 1=4 a", -2, 1, -2, 1, 0, ent);
+	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 };
-	do_scan(__LINE__, zh, "@attr 1=4 a", -2, 3, -2, 3, 0, ent);
+	YAZ_CHECK(tl_scan(zh, "@attr 1=4 a", -2, 3, -2, 3, 0, ent));
     }
     if (1)
     {
 	const char *ent[] = { "d", "e", "f", 0 };
-	do_scan(__LINE__, zh, "@attr 1=4 a", -2, 4, -2, 3, 1, ent);
+	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 };
-	do_scan(__LINE__, zh, "@attr 1=4 0", 2, 100, 1, 6, 1, ent);
+	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 };
-	do_scan(__LINE__, zh, "@attr 1=4 0", 0, 100, 0, 5, 1, ent);
+	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 };
-	do_scan(__LINE__, zh, "@attr 1=4 0", 10, 100, 1, 6, 1, ent);
+	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 };
-	do_scan(__LINE__, zh, "@attr 1=4 0", 100, 10, 1, 6, 1, ent);
+	YAZ_CHECK(tl_scan(zh, "@attr 1=4 0", 22, 10, 1, 0, 1, ent));
     }
     if (1)
     {
-	do_scan(__LINE__, zh, "@attr 1=4 z", -100, 10, 1, 6, 1, 0);
+	YAZ_CHECK(tl_scan(zh, "@attr 1=4 z", -22, 10, -22, 0, 1, 0));
     }
-    return close_down(zh, zs, 0);
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
+
+TL_MAIN
+