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
Reformat: delete trailing whitespace
[idzebra-moved-to-github.git]
/
test
/
api
/
test_sortidx.c
diff --git
a/test/api/test_sortidx.c
b/test/api/test_sortidx.c
index
ebd03ca
..
f92cb57
100644
(file)
--- a/
test/api/test_sortidx.c
+++ b/
test/api/test_sortidx.c
@@
-1,5
+1,5
@@
/* This file is part of the Zebra server.
/* This file is part of the Zebra server.
- Copyright (C) 1995-2008 Index Data
+ Copyright (C) 1994-2011 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
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
@@
-17,10
+17,23
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <idzebra/bfile.h>
#include <sortidx.h>
#include "testlib.h"
#include <idzebra/bfile.h>
#include <sortidx.h>
#include "testlib.h"
+static void sort_add_cstr(zebra_sort_index_t si, const char *str,
+ zint section_id)
+{
+ WRBUF w = wrbuf_alloc();
+ wrbuf_puts(w, str);
+ wrbuf_putc(w, '\0');
+ zebra_sort_add(si, section_id, w);
+ wrbuf_destroy(w);
+}
+
static void tst1(zebra_sort_index_t si)
{
zint sysno = 12; /* just some sysno */
static void tst1(zebra_sort_index_t si)
{
zint sysno = 12; /* just some sysno */
@@
-30,38
+43,38
@@
static void tst1(zebra_sort_index_t si)
zebra_sort_type(si, my_type);
zebra_sort_sysno(si, sysno);
zebra_sort_type(si, my_type);
zebra_sort_sysno(si, sysno);
- YAZ_CHECK_EQ(zebra_sort_read(si, w), 0);
+ YAZ_CHECK_EQ(zebra_sort_read(si, 0, w), 0);
- zebra_sort_add(si, "abcde1", 6);
+ sort_add_cstr(si, "abcde1", 0);
zebra_sort_sysno(si, sysno);
zebra_sort_sysno(si, sysno);
- YAZ_CHECK_EQ(zebra_sort_read(si, w), 1);
+ YAZ_CHECK_EQ(zebra_sort_read(si, 0, w), 1);
YAZ_CHECK(!strcmp(wrbuf_cstr(w), "abcde1"));
zebra_sort_sysno(si, sysno+1);
YAZ_CHECK(!strcmp(wrbuf_cstr(w), "abcde1"));
zebra_sort_sysno(si, sysno+1);
- YAZ_CHECK_EQ(zebra_sort_read(si, w), 0);
+ YAZ_CHECK_EQ(zebra_sort_read(si, 0, w), 0);
zebra_sort_sysno(si, sysno-1);
zebra_sort_sysno(si, sysno-1);
- YAZ_CHECK_EQ(zebra_sort_read(si, w), 0);
+ YAZ_CHECK_EQ(zebra_sort_read(si, 0, w), 0);
zebra_sort_sysno(si, sysno);
zebra_sort_sysno(si, sysno);
- zebra_sort_delete(si);
- YAZ_CHECK_EQ(zebra_sort_read(si, w), 0);
+ zebra_sort_delete(si, 0);
+ YAZ_CHECK_EQ(zebra_sort_read(si, 0, w), 0);
zebra_sort_type(si, my_type);
zebra_sort_sysno(si, sysno);
zebra_sort_type(si, my_type);
zebra_sort_sysno(si, sysno);
- YAZ_CHECK_EQ(zebra_sort_read(si, w), 0);
+ YAZ_CHECK_EQ(zebra_sort_read(si, 0, w), 0);
wrbuf_rewind(w);
wrbuf_rewind(w);
- zebra_sort_add(si, "abcde1", 6);
+ sort_add_cstr(si, "abcde1", 0);
zebra_sort_sysno(si, sysno);
zebra_sort_sysno(si, sysno);
- YAZ_CHECK_EQ(zebra_sort_read(si, w), 1);
+ YAZ_CHECK_EQ(zebra_sort_read(si, 0, w), 1);
YAZ_CHECK(!strcmp(wrbuf_cstr(w), "abcde1"));
zebra_sort_sysno(si, sysno);
YAZ_CHECK(!strcmp(wrbuf_cstr(w), "abcde1"));
zebra_sort_sysno(si, sysno);
- zebra_sort_delete(si);
+ zebra_sort_delete(si, 0);
wrbuf_destroy(w);
}
wrbuf_destroy(w);
}
@@
-76,22
+89,25
@@
static void tst2(zebra_sort_index_t si)
for (sysno = 1; sysno < 50; sysno++)
{
for (sysno = 1; sysno < 50; sysno++)
{
+ zint input_section_id = 12345;
+ zint output_section_id = 0;
WRBUF w1 = wrbuf_alloc();
WRBUF w2 = wrbuf_alloc();
zebra_sort_sysno(si, sysno);
WRBUF w1 = wrbuf_alloc();
WRBUF w2 = wrbuf_alloc();
zebra_sort_sysno(si, sysno);
- YAZ_CHECK_EQ(zebra_sort_read(si, w2), 0);
-
+ YAZ_CHECK_EQ(zebra_sort_read(si, 0, w2), 0);
+
for (i = 0; i < 600; i++) /* 600 * 6 < max size =4K */
wrbuf_write(w1, "12345", 6);
for (i = 0; i < 600; i++) /* 600 * 6 < max size =4K */
wrbuf_write(w1, "12345", 6);
-
- zebra_sort_add(si, wrbuf_buf(w1), wrbuf_len(w1));
-
+
+ zebra_sort_add(si, input_section_id, w1);
+
zebra_sort_sysno(si, sysno);
zebra_sort_sysno(si, sysno);
-
- YAZ_CHECK_EQ(zebra_sort_read(si, w2), 1);
-
+
+ YAZ_CHECK_EQ(zebra_sort_read(si, &output_section_id, w2), 1);
+
YAZ_CHECK_EQ(wrbuf_len(w1), wrbuf_len(w2));
YAZ_CHECK(!memcmp(wrbuf_buf(w1), wrbuf_buf(w2), wrbuf_len(w2)));
YAZ_CHECK_EQ(wrbuf_len(w1), wrbuf_len(w2));
YAZ_CHECK(!memcmp(wrbuf_buf(w1), wrbuf_buf(w2), wrbuf_len(w2)));
+ YAZ_CHECK_EQ(input_section_id, output_section_id);
wrbuf_destroy(w1);
wrbuf_destroy(w2);
}
wrbuf_destroy(w1);
wrbuf_destroy(w2);
}
@@
-145,6
+161,7
@@
TL_MAIN
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab