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
Renamed API function zebra_deleleResultSet to zebra_deleteResultSet.
[idzebra-moved-to-github.git]
/
test
/
api
/
t7.c
diff --git
a/test/api/t7.c
b/test/api/t7.c
index
2378a6a
..
2c048c8
100644
(file)
--- a/
test/api/t7.c
+++ b/
test/api/t7.c
@@
-1,6
+1,6
@@
-/* $Id: t7.c,v 1.3 2004-10-28 15:24:36 heikki Exp $
- Copyright (C) 2004
- Index Data Aps
+/* $Id: t7.c,v 1.7 2005-01-22 12:20:35 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,23
+20,23
@@
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 <yaz/sortspec.h>
-#include <idzebra/api.h>
+/** t7.c sorting */
#include "testlib.h"
#include "testlib.h"
+#include <yaz/sortspec.h>
-
-int main(int argc, char **argv)
-{
- ZebraService zs;
- ZebraHandle zh;
- const char *recs[] = {
+const char *recs[] = {
"<gils>\n"
" <title>My title</title>\n"
"</gils>\n",
0};
"<gils>\n"
" <title>My title</title>\n"
"</gils>\n",
0};
+
+
+int main(int argc, char **argv)
+{
+ ZebraService zs = start_up(0, argc, argv);
+ ZebraHandle zh = zebra_open (zs);
+
const char *setname1="set1";
const char *setname2="set2";
const char *setname3="set3";
const char *setname1="set1";
const char *setname2="set2";
const char *setname3="set3";
@@
-51,19
+51,11
@@
int main(int argc, char **argv)
yaz_sort_spec (odr_output, "@attr 1=4 id");
int hits;
yaz_sort_spec (odr_output, "@attr 1=4 id");
int hits;
- yaz_log_init_file("t7.log");
-
- nmem_init ();
-
- zs = start_service(""); /* default to zebra.cfg */
- zh = zebra_open (zs);
-
- init_data(zh,recs);
-
+ init_data(zh, recs);
- zebra_begin_trans (zh, 0);
+ zebra_begin_trans(zh, 0);
- zebra_search_RPN (zh, odr_input, query, setname1, &hits);
+ zebra_search_RPN(zh, odr_input, query, setname1, &hits);
rc=zebra_sort(zh, odr_output, 1, &setname1, setname2, spec, &status);
if (rc)
rc=zebra_sort(zh, odr_output, 1, &setname1, setname2, spec, &status);
if (rc)
@@
-79,22
+71,17
@@
int main(int argc, char **argv)
exit(1);
}
exit(1);
}
- zebra_end_trans (zh);
+ zebra_end_trans(zh);
yaz_pqf_destroy(parser);
/*
yaz_pqf_destroy(parser);
/*
- zebra_deleleResultSet(zh, Z_DeleteRequest_list,
+ zebra_deleteResultSet(zh, Z_DeleteRequest_list,
1, &setnamep, &status);
*/
1, &setnamep, &status);
*/
- 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);
}
}