X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft4.c;h=de48f897b4aecc3985d99580b0107e7e5e90f900;hb=97a7adeb9e5059463f039495cc01cfa448463a27;hp=3590701f8d7af90832f00bbaff02a0ffe8e9addb;hpb=9a6e6e95d703c4f42f83e969404daa74ef7e2c20;p=idzebra-moved-to-github.git

diff --git a/test/api/t4.c b/test/api/t4.c
index 3590701..de48f89 100644
--- a/test/api/t4.c
+++ b/test/api/t4.c
@@ -1,8 +1,5 @@
-/* $Id: t4.c,v 1.16 2005-04-14 12:01:50 adam Exp $
-   Copyright (C) 1995-2005
-   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
@@ -15,9 +12,9 @@ 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
+
 */
 
 /* t4 - insert a small pile of records, search and fetch them */
@@ -32,33 +29,36 @@ const char *myrec[] = {
 	
 #define NUMBER_TO_FETCH_MAX 1000
 
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
     int i;
     int number_to_be_inserted = 5;
     int number_to_fetch = 5;
 
-    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);
+
+    YAZ_CHECK(tl_init_data(zh, myrec));
 
-    init_data(zh, myrec);
+    YAZ_CHECK(zebra_begin_trans (zh, 1) == ZEBRA_OK);
 
-    zebra_begin_trans (zh, 1);
     for (i = 0; i< number_to_be_inserted-1; i++)
     {  /* -1 since already inserted one in init_data */
 	zebra_add_record(zh, myrec[0], strlen(myrec[0]));
     }
-    zebra_end_trans(zh);
+    YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
+
     zebra_close(zh);
     zebra_stop(zs);
 
-    zs = start_service("");
-    zh = zebra_open(zs);
-    zebra_select_database(zh, "Default");
+    zs = tl_zebra_start("");
+    zh = zebra_open(zs, 0);
+    YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
     zebra_set_resource(zh, "sortmax", "3"); /* make small sort boundary */
 
     for (i = 0; i<2; i++)
     {
+	ZEBRA_RES ret;
         ZebraRetrievalRecord retrievalRecord[NUMBER_TO_FETCH_MAX];
         char setname[20];
         int j;
@@ -69,7 +69,13 @@ int main(int argc, char **argv)
         zint hits;
         
         sprintf(setname, "s%d", i+1);
-        zebra_search_RPN(zh, odr_input, query, setname, &hits);
+        ret = zebra_search_RPN(zh, odr_input, query, setname, &hits);
+	if (ret != ZEBRA_OK)
+	{
+	    int code = zebra_errCode(zh);
+	    yaz_log(YLOG_WARN, "Unexpected error code=%d", code);
+	    exit(1);
+	}
 	if (hits != number_to_be_inserted)
 	{
 	    yaz_log(YLOG_WARN, "Unexpected hit count " ZINT_FORMAT 
@@ -81,18 +87,19 @@ int main(int argc, char **argv)
 
         odr_destroy(odr_input);
 
-        zebra_begin_trans(zh, 1);
+        YAZ_CHECK(zebra_begin_trans(zh, 1) == ZEBRA_OK);
 
 	for (j = 0; j < number_to_fetch; j++)
 	    retrievalRecord[j].position = j+1;
 
-        zebra_records_retrieve(zh, odr_output, setname, 0,
-			       VAL_TEXT_XML, number_to_fetch, retrievalRecord);
-	
-	if (zebra_errCode(zh))
+        ret = zebra_records_retrieve(zh, odr_output, setname, 0,
+				     yaz_oid_recsyn_xml, number_to_fetch,
+				     retrievalRecord);
+	if (ret != ZEBRA_OK)
 	{
+	    int code = zebra_errCode(zh);
 	    yaz_log(YLOG_FATAL, "zebra_records_retrieve returned error %d",
-		    zebra_errCode(zh));
+		    code);
 	    exit(1);
 	}
 	
@@ -111,9 +118,19 @@ int main(int argc, char **argv)
 	}
         odr_destroy(odr_output);
 
-        zebra_end_trans(zh);
-
+        YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
     }
     zebra_commit(zh);
-    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
+ */
+