X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft6.c;h=68ae01a7a1ffd684a76a2c7f95610b784cf0e0ca;hb=4097bac1dce126e79ce1550fad8b2034a311ff80;hp=5d73bf28caba18a81711749b2d813f3910d2f641;hpb=c093259af1129171ffb244fe10f5110d7463d88d;p=idzebra-moved-to-github.git

diff --git a/test/api/t6.c b/test/api/t6.c
index 5d73bf2..68ae01a 100644
--- a/test/api/t6.c
+++ b/test/api/t6.c
@@ -1,5 +1,5 @@
-/* $Id: t6.c,v 1.10 2005-08-05 10:40:13 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: t6.c,v 1.15 2007-01-15 15:10:20 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,24 +15,24 @@ 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
+
 */
 
 /** t6.c Insert a number of randomly generated words */
 
 #include "testlib.h"
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
     int i;
-    ZebraService zs = start_up("zebra6.cfg", argc, argv);
-    ZebraHandle zh = zebra_open(zs);
+    ZebraService zs = tl_start_up("zebra6.cfg", argc, argv);
+    ZebraHandle zh = zebra_open(zs, 0);
 
     srand(17);
     
-    zebra_select_database(zh, "Default");
+    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
     zebra_init(zh);
     zebra_close(zh);
 
@@ -40,10 +40,12 @@ int main(int argc, char **argv)
     {
 	int l;
 
-	zh = zebra_open (zs);
-	zebra_select_database(zh, "Default");
+	zh = zebra_open (zs, 0);
+	YAZ_CHECK(zh);
+
+	YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
 	
-	zebra_begin_trans (zh, 1);
+	YAZ_CHECK(zebra_begin_trans (zh, 1) == ZEBRA_OK);
 
 	for (l = 0; l<100; l++)
 	{
@@ -70,17 +72,28 @@ int main(int argc, char **argv)
 	    strcat(rec_buf, "</Control-Identifier></gils>");
 	    zebra_add_record (zh, rec_buf, strlen(rec_buf));
 	}
-	zebra_end_trans(zh);
+	YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
 	zebra_close(zh);
     }
-    zh = zebra_open(zs);
+    zh = zebra_open(zs, 0);
+    YAZ_CHECK(zh);
 
-    zebra_select_database(zh, "Default");
+    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
 
     zebra_set_resource(zh, "trunclimit", "2");
 
     /* check massive truncation: bug #281 */
-    do_query(__LINE__, zh, "@attr 1=4 @attr 2=1 z", -1);
+    YAZ_CHECK(tl_query(zh, "@attr 1=4 @attr 2=1 z", -1));
 
-    return close_down(zh, zs, 0);
+    YAZ_CHECK(tl_close_down(zh, zs));
 }
+
+TL_MAIN
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+