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
Change return type for a zebra_add_record + zebra_repository functions to
[idzebra-moved-to-github.git]
/
test
/
xpath
/
xpath6.c
diff --git
a/test/xpath/xpath6.c
b/test/xpath/xpath6.c
index
7eac00e
..
c66235f
100644
(file)
--- a/
test/xpath/xpath6.c
+++ b/
test/xpath/xpath6.c
@@
-1,4
+1,4
@@
-/* $Id: xpath6.c,v 1.6 2005-11-09 08:09:44 adam Exp $
+/* $Id: xpath6.c,v 1.9 2006-05-10 08:13:41 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-22,55
+22,71
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include "../api/testlib.h"
#include "../api/testlib.h"
-int main(int argc, char **argv)
+static void tst(int argc, char **argv)
{
int i;
{
int i;
- ZebraService zs = start_up(0, argc, argv);
+ ZebraService zs = tl_start_up(0, argc, argv);
ZebraHandle zh = zebra_open(zs, 0);
char path[256];
ZebraHandle zh = zebra_open(zs, 0);
char path[256];
- zebra_select_database(zh, "Default");
+ YAZ_CHECK(zebra_select_database(zh, "Default") == ZEBRA_OK);
zebra_init(zh);
zebra_init(zh);
- check_filter(zs, "grs.xml");
+ tl_check_filter(zs, "grs.xml");
zebra_set_resource(zh, "recordType", "grs.xml");
zebra_set_resource(zh, "recordType", "grs.xml");
- zebra_begin_trans(zh, 1);
+ YAZ_CHECK(zebra_begin_trans(zh, 1) == ZEBRA_OK);
for (i = 1; i <= 2; i++)
{
for (i = 1; i <= 2; i++)
{
- sprintf(path, "%.200s/rec%d.xml", get_srcdir(), i);
+ sprintf(path, "%.200s/rec%d.xml", tl_get_srcdir(), i);
zebra_repository_update(zh, path);
}
zebra_repository_update(zh, path);
}
- zebra_end_trans(zh);
+ YAZ_CHECK(zebra_end_trans(zh) == ZEBRA_OK);
zebra_commit(zh);
zebra_commit(zh);
- do_query(__LINE__, zh, "@attr 5=1 @attr 6=3 @attr 4=1 @attr 1=/assembled/basic/names/CASno \"367-93-1\"", 2);
+ YAZ_CHECK(tl_query(zh, "@attr 5=1 @attr 6=3 @attr 4=1 @attr 1=/assembled/basic/names/CASno \"367-93-1\"", 2));
- do_query(__LINE__, zh, "@attr 5=1 @attr 6=3 @attr 4=1 @attr 1=18 \"367-93-1\"", 2);
+ YAZ_CHECK(tl_query(zh, "@attr 5=1 @attr 6=3 @attr 4=1 @attr 1=18 \"367-93-1\"", 2));
- do_query(__LINE__, zh, "@attr 1=/assembled/orgs/org 0", 1);
+ YAZ_CHECK(tl_query(zh, "@attr 1=/assembled/orgs/org 0", 1));
- do_query(__LINE__, zh,
+ YAZ_CHECK(tl_query(zh,
"@and @attr 1=/assembled/orgs/org 0 @attr 5=1 @attr 6=3 @attr 4=1 "
"@and @attr 1=/assembled/orgs/org 0 @attr 5=1 @attr 6=3 @attr 4=1 "
- "@attr 1=/assembled/basic/names/CASno \"367-93-1\"", 1);
+ "@attr 1=/assembled/basic/names/CASno \"367-93-1\"", 1));
- do_query(__LINE__, zh,
+ YAZ_CHECK(tl_query(zh,
"@and @attr 1=/assembled/orgs/org 1 @attr 5=1 @attr 6=3 @attr 4=1 "
"@and @attr 1=/assembled/orgs/org 1 @attr 5=1 @attr 6=3 @attr 4=1 "
- "@attr 1=/assembled/basic/names/CASno 367-93-1", 2);
+ "@attr 1=/assembled/basic/names/CASno 367-93-1", 2));
/* bug #317 */
/* bug #317 */
- do_query(__LINE__, zh, "@attr 1=1010 46", 2);
+ YAZ_CHECK(tl_query(zh, "@attr 1=1010 46", 2));
/* bug #431 */
/* bug #431 */
- do_query(__LINE__, zh, "@attr 1=1021 0", 1);
+ YAZ_CHECK(tl_query(zh, "@attr 1=1021 0", 1));
/* bug #431 */
/* bug #431 */
- do_query(__LINE__, zh, "@attr 1=1021 46", 1);
+ YAZ_CHECK(tl_query(zh, "@attr 1=1021 46", 1));
/* bug #431 */
/* bug #431 */
- do_query(__LINE__, zh, "@attr 1=1021 1", 0);
+ YAZ_CHECK(tl_query(zh, "@attr 1=1021 1", 0));
- return close_down(zh, zs, 0);
+ /* bug #460 */
+ YAZ_CHECK(tl_query(zh, "@attr 1=4 46", 0));
+
+ /* bug #460 */
+ YAZ_CHECK(tl_query(zh, "@attr 1=4 beta", 1));
+
+ 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
+ */
+