projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New mergekey facilities. Bug #2343 and bug #2800).
[pazpar2-moved-to-github.git]
/
src
/
test_config.c
diff --git
a/src/test_config.c
b/src/test_config.c
index
17c6381
..
3d7e091
100644
(file)
--- a/
src/test_config.c
+++ b/
src/test_config.c
@@
-43,59
+43,68
@@
void test_conf_service(int argc, char **argv)
// expected metadata failures
YAZ_CHECK(!conf_service_add_metadata(0, service, 0, "dead_nmem",
// expected metadata failures
YAZ_CHECK(!conf_service_add_metadata(0, service, 0, "dead_nmem",
- Metadata_type_generic,
- Metadata_merge_unique,
- Metadata_setting_no,
- 1, 1, 1, 0));
+ Metadata_type_generic,
+ Metadata_merge_unique,
+ Metadata_setting_no,
+ 1, 1, 1, 0,
+ Metadata_mergekey_no));
YAZ_CHECK(!conf_service_add_metadata(nmem, 0, 0, "service_needed",
Metadata_type_generic,
Metadata_merge_unique,
Metadata_setting_no,
YAZ_CHECK(!conf_service_add_metadata(nmem, 0, 0, "service_needed",
Metadata_type_generic,
Metadata_merge_unique,
Metadata_setting_no,
- 1, 1, 1, 0));
+ 1, 1, 1, 0,
+ Metadata_mergekey_no));
YAZ_CHECK(!conf_service_add_metadata(nmem, service, -1, "out_of_bounds",
Metadata_type_generic,
Metadata_merge_unique,
Metadata_setting_no,
YAZ_CHECK(!conf_service_add_metadata(nmem, service, -1, "out_of_bounds",
Metadata_type_generic,
Metadata_merge_unique,
Metadata_setting_no,
- 1, 1, 1, 0));
+ 1, 1, 1, 0,
+ Metadata_mergekey_no));
YAZ_CHECK(!conf_service_add_metadata(nmem, service, 4, "out_of_bounds",
Metadata_type_generic,
Metadata_merge_unique,
Metadata_setting_no,
YAZ_CHECK(!conf_service_add_metadata(nmem, service, 4, "out_of_bounds",
Metadata_type_generic,
Metadata_merge_unique,
Metadata_setting_no,
- 1, 1, 1, 0));
+ 1, 1, 1, 0,
+ Metadata_mergekey_no));
YAZ_CHECK(!conf_service_add_metadata(nmem, service, 0, 0, //missing name
Metadata_type_generic,
Metadata_merge_unique,
Metadata_setting_no,
YAZ_CHECK(!conf_service_add_metadata(nmem, service, 0, 0, //missing name
Metadata_type_generic,
Metadata_merge_unique,
Metadata_setting_no,
- 1, 1, 1, 0));
+ 1, 1, 1, 0,
+ Metadata_mergekey_no));
// expected metadata sucesses
YAZ_CHECK(conf_service_add_metadata(nmem, service, 0, "title",
Metadata_type_generic,
Metadata_merge_unique,
Metadata_setting_no,
// expected metadata sucesses
YAZ_CHECK(conf_service_add_metadata(nmem, service, 0, "title",
Metadata_type_generic,
Metadata_merge_unique,
Metadata_setting_no,
- 1, 1, 1, 0));
+ 1, 1, 1, 0,
+ Metadata_mergekey_no));
YAZ_CHECK(conf_service_add_metadata(nmem, service, 1, "author",
Metadata_type_generic,
Metadata_merge_longest,
YAZ_CHECK(conf_service_add_metadata(nmem, service, 1, "author",
Metadata_type_generic,
Metadata_merge_longest,
- Metadata_setting_no,
- 1, 1, 1, 0));
+ Metadata_setting_no,
+ 1, 1, 1, 0,
+ Metadata_mergekey_no));
YAZ_CHECK(conf_service_add_metadata(nmem, service, 2, "isbn",
Metadata_type_number,
Metadata_merge_no,
YAZ_CHECK(conf_service_add_metadata(nmem, service, 2, "isbn",
Metadata_type_number,
Metadata_merge_no,
- Metadata_setting_no,
- 1, 1, 1, 0));
+ Metadata_setting_no,
+ 1, 1, 1, 0,
+ Metadata_mergekey_no));
YAZ_CHECK(conf_service_add_metadata(nmem, service, 3, "year",
Metadata_type_year,
Metadata_merge_range,
YAZ_CHECK(conf_service_add_metadata(nmem, service, 3, "year",
Metadata_type_year,
Metadata_merge_range,
- Metadata_setting_no,
- 1, 1, 1, 0));
+ Metadata_setting_no,
+ 1, 1, 1, 0,
+ Metadata_mergekey_no));
// expected sortkey failures
// expected sortkey failures
@@
-157,7
+166,9
@@
int main(int argc, char **argv)
/*
* 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
*/
+