X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fapi%2Ft3.c;h=6f5ef0276ecb436ec273c931dcb0653ff2a49ccd;hp=711790713dcc25ba3778672218fbbf188b6ebd97;hb=1922579d92e1a9559d4c3ab4f1cf461f56c83c3b;hpb=3d3d0cebd23fa527a7e9d5d728e3c744acb37580 diff --git a/test/api/t3.c b/test/api/t3.c index 7117907..6f5ef02 100644 --- a/test/api/t3.c +++ b/test/api/t3.c @@ -1,8 +1,5 @@ -/* $Id: t3.c,v 1.18 2005-09-13 11:51:07 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 + */ /* Creates a few result sets */ @@ -30,14 +27,13 @@ const char *myrec[] ={ "\n", 0}; - -int main(int argc, char **argv) +static void tst(int argc, char **argv) { int i; - ZebraService zs = start_up(0, argc, argv); + 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++) { @@ -50,14 +46,30 @@ int main(int argc, char **argv) Z_RPNQuery *query = yaz_pqf_parse(parser, odr_input, "@attr 1=4 my"); zint hits; - zebra_begin_trans (zh, 1); - zebra_begin_trans (zh, 0); + 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); zebra_deleteResultSet(zh, Z_DeleteRequest_list, 1, &setnamep, &status); @@ -66,5 +78,16 @@ int main(int argc, char **argv) } 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 + */ +