X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fapi%2Ft3.c;h=1f2077e162fd9d9997c7d613d57d7f76097f267d;hb=c401b3a1421e31b3d6b77bc7bac6ffb934207df1;hp=11616448aece7f3b264abbabdeaa4bb8cf58b214;hpb=9af25502b9e14213d1d44e99e38f752c3a174b44;p=idzebra-moved-to-github.git

diff --git a/test/api/t3.c b/test/api/t3.c
index 1161644..1f2077e 100644
--- a/test/api/t3.c
+++ b/test/api/t3.c
@@ -1,6 +1,6 @@
-/* $Id: t3.c,v 1.13 2004-12-02 11:28:20 adam Exp $
-   Copyright (C) 2003,2004
-   Index Data Aps
+/* $Id: t3.c,v 1.21 2006-08-14 10:40:22 adam Exp $
+   Copyright (C) 1995-2006
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -15,9 +15,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
+
 */
 
 /* Creates a few result sets */
@@ -30,20 +30,16 @@ const char *myrec[] ={
         "</gils>\n",
         0};
 
-	
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
 {
     int i;
-    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(tl_init_data(zh, myrec));
 
     for (i = 0; i<4; i++)
     {
-#if 0
-        ZebraRetrievalRecord retrievalRecord;
-#endif
         char setname[20];
         char *setnamep = setname;
         int status;
@@ -52,29 +48,49 @@ int main(int argc, char **argv)
         YAZ_PQF_Parser parser = yaz_pqf_create();
         Z_RPNQuery *query = yaz_pqf_parse(parser, odr_input, 
                                           "@attr 1=4 my");
-        int hits;
-        zebra_begin_trans (zh, 1);
-        zebra_begin_trans (zh, 0);
+        zint hits;
+        if (zebra_begin_trans (zh, 1) != ZEBRA_OK)
+	{
+	    fprintf(stderr, "zebra_begin_trans failed\n");
+	    exit(1);
+	}
+        if (zebra_begin_trans (zh, 0) != ZEBRA_OK)
+	{
+	    fprintf(stderr, "zebra_begin_trans failed\n");
+	    exit(1);
+	}
         
         sprintf(setname, "s%d", i+1);
         zebra_search_RPN (zh, odr_input, query, setname, &hits);
 
-        zebra_end_trans (zh);
-        zebra_end_trans (zh);
+        if (zebra_end_trans (zh) != ZEBRA_OK)
+	{
+	    fprintf(stderr, "zebra_end_trans failed\n");
+	    exit(1);
+	}
+        if (zebra_end_trans (zh) != ZEBRA_OK)
+	{
+	    fprintf(stderr, "zebra_end_trans failed\n");
+	    exit(1);
+	}
         yaz_pqf_destroy(parser);
-#if 0
-        /*FIXME Why is this disabled ??? */
-        zebra_records_retrieve(zh, odr_output, setname, 0,
-			       VAL_TEXT_XML, 1, &retrievalRecord);
-#endif
-#if 1
-        zebra_deleleResultSet(zh, Z_DeleteRequest_list,
+        zebra_deleteResultSet(zh, Z_DeleteRequest_list,
                               1, &setnamep, &status);
-#endif
         odr_destroy(odr_input);
         odr_destroy(odr_output);
     }
     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
+ */
+