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
Refactored more stuff into testlib, cleaned up the tests.
[idzebra-moved-to-github.git]
/
test
/
api
/
t3.c
diff --git
a/test/api/t3.c
b/test/api/t3.c
index
771b95c
..
5d7caa5
100644
(file)
--- a/
test/api/t3.c
+++ b/
test/api/t3.c
@@
-1,5
+1,5
@@
-/* $Id: t3.c,v 1.1 2003-05-19 21:37:38 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: t3.c,v 1.12 2004-10-29 13:02:39 heikki Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
This file is part of the Zebra server.
Index Data Aps
This file is part of the Zebra server.
@@
-20,28
+20,24
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
+/* Creates a few result sets */
-#include <yaz/pquery.h>
-#include <zebraapi.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";
- nmem_init ();
-
- zs = zebra_start("t2.cfg");
- zh = zebra_open (zs);
- zebra_select_database(zh, "Default");
+ ZebraService zs = start_up(0, argc, argv);
+ ZebraHandle zh = zebra_open (zs);
- zebra_begin_trans (zh, 1);
- zebra_record_insert (zh, myrec, strlen(myrec));
- zebra_end_trans (zh);
+ init_data(zh,myrec);
for (i = 0; i<4; i++)
{
for (i = 0; i<4; i++)
{
@@
-61,12
+57,13
@@
int main(int argc, char **argv)
zebra_begin_trans (zh, 0);
sprintf(setname, "s%d", i+1);
zebra_begin_trans (zh, 0);
sprintf(setname, "s%d", i+1);
- zebra_search_rpn (zh, odr_input, odr_output, query, setname, &hits);
+ zebra_search_RPN (zh, odr_input, query, setname, &hits);
zebra_end_trans (zh);
zebra_end_trans (zh);
yaz_pqf_destroy(parser);
#if 0
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
zebra_records_retrieve (zh, odr_output, setname, 0,
VAL_TEXT_XML, 1, &retrievalRecord);
#endif
@@
-78,10
+75,6
@@
int main(int argc, char **argv)
odr_destroy (odr_output);
}
zebra_commit (zh);
odr_destroy (odr_output);
}
zebra_commit (zh);
- zebra_close (zh);
- zebra_stop (zs);
- nmem_exit ();
- xmalloc_trav ("x");
- exit (0);
+ return close_down(zh,zs,0);
}
}