projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use mode to switch between presentation format brief and indexing.
[idzebra-moved-to-github.git]
/
test
/
api
/
t3.c
diff --git
a/test/api/t3.c
b/test/api/t3.c
index
adf8be1
..
8164a0d
100644
(file)
--- a/
test/api/t3.c
+++ b/
test/api/t3.c
@@
-1,6
+1,6
@@
-/* $Id: t3.c,v 1.11 2004-10-28 15:24:36 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: t3.c,v 1.17 2005-04-15 10:47:49 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.
@@
-20,41
+20,27
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-#include <yaz/log.h>
-#include <yaz/pquery.h>
-#include <idzebra/api.h>
+/* Creates a few result sets */
+
#include "testlib.h"
#include "testlib.h"
+const char *myrec[] ={
+ "<gils>\n"
+ " <title>My title</title>\n"
+ "</gils>\n",
+ 0};
+
int main(int argc, char **argv)
{
int i;
int main(int argc, char **argv)
{
int i;
- ZebraService zs;
- ZebraHandle zh;
- const char *myrec =
- "<gils>\n"
- " <title>My title</title>\n"
- "</gils>\n";
-
- yaz_log_init_file("t3.log");
- yaz_log_init_level(LOG_ALL);
-
- nmem_init ();
-
- zs = start_service(0);
- zh = zebra_open (zs);
- zebra_select_database(zh, "Default");
- zebra_init(zh);
+ ZebraService zs = start_up(0, argc, argv);
+ ZebraHandle zh = zebra_open(zs);
- zebra_begin_trans (zh, 1);
- zebra_add_record (zh, myrec, strlen(myrec));
- zebra_end_trans (zh);
+ init_data(zh, myrec);
for (i = 0; i<4; i++)
{
for (i = 0; i<4; i++)
{
-#if 0
- ZebraRetrievalRecord retrievalRecord;
-#endif
char setname[20];
char *setnamep = setname;
int status;
char setname[20];
char *setnamep = setname;
int status;
@@
-63,7
+49,7
@@
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");
YAZ_PQF_Parser parser = yaz_pqf_create();
Z_RPNQuery *query = yaz_pqf_parse(parser, odr_input,
"@attr 1=4 my");
- int hits;
+ zint hits;
zebra_begin_trans (zh, 1);
zebra_begin_trans (zh, 0);
zebra_begin_trans (zh, 1);
zebra_begin_trans (zh, 0);
@@
-73,24
+59,12
@@
int main(int argc, char **argv)
zebra_end_trans (zh);
zebra_end_trans (zh);
yaz_pqf_destroy(parser);
zebra_end_trans (zh);
zebra_end_trans (zh);
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);
1, &setnamep, &status);
-#endif
- odr_destroy (odr_input);
- odr_destroy (odr_output);
+ odr_destroy(odr_input);
+ odr_destroy(odr_output);
}
}
- zebra_commit (zh);
- zebra_close (zh);
- zebra_stop (zs);
+ zebra_commit(zh);
- nmem_exit ();
- xmalloc_trav ("x");
- logf(LOG_LOG,"================ All tests OK ");
- exit (0);
+ return close_down(zh, zs, 0);
}
}