X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest_record.c;h=45bf9d0e3cc3160dec04bf546216d021e37d6a4a;hb=c61cbac9542ca9443e4fb0c215240bd9053a54f8;hp=b035c4a644e19f64306e20047cbdb2cd3114a93b;hpb=c4bea22d2a7a8c5c78af710ce1629274df2a941a;p=pazpar2-moved-to-github.git diff --git a/src/test_record.c b/src/test_record.c index b035c4a..45bf9d0 100644 --- a/src/test_record.c +++ b/src/test_record.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2008 Index Data + Copyright (C) 2006-2009 Index Data Pazpar2 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 @@ -53,33 +53,45 @@ void test_record(int argc, char **argv) data_num.number.max = 5; - service = conf_service_create(nmem, 4, 3); + service = conf_service_create(4, 3); YAZ_CHECK(service); - YAZ_CHECK(conf_service_add_metadata(nmem, service, 0, "title", - Metadata_type_generic, Metadata_merge_unique, - Metadata_setting_no, 1, 1, 1, 0)); - - YAZ_CHECK(conf_service_add_metadata(nmem, service, 1, "author", - Metadata_type_generic, Metadata_merge_longest, - Metadata_setting_no,1, 1, 1, 0)); - - YAZ_CHECK(conf_service_add_metadata(nmem, service, 2, "isbn", - Metadata_type_number, Metadata_merge_no, - Metadata_setting_no, 1, 1, 1, 0)); - - YAZ_CHECK(conf_service_add_metadata(nmem, service, 3, "year", - Metadata_type_year, Metadata_merge_range, - Metadata_setting_no, 1, 1, 1, 0)); - - YAZ_CHECK(conf_service_add_sortkey(nmem, service, 0, "relevance", - Metadata_sortkey_relevance)); - - YAZ_CHECK(conf_service_add_sortkey(nmem, service, 1, "title", - Metadata_sortkey_string)); + YAZ_CHECK(conf_service_add_metadata( + service, 0, "title", + Metadata_type_generic, Metadata_merge_unique, + Metadata_setting_no, 1, 1, 1, 0, + Metadata_mergekey_no + )); + + YAZ_CHECK(conf_service_add_metadata( + service, 1, "author", + Metadata_type_generic, Metadata_merge_longest, + Metadata_setting_no,1, 1, 1, 0, + Metadata_mergekey_no)); + + YAZ_CHECK(conf_service_add_metadata( + service, 2, "isbn", + Metadata_type_number, Metadata_merge_no, + Metadata_setting_no, 1, 1, 1, 0, + Metadata_mergekey_no)); + + YAZ_CHECK(conf_service_add_metadata( + service, 3, "year", + Metadata_type_year, Metadata_merge_range, + Metadata_setting_no, 1, 1, 1, 0, + Metadata_mergekey_no)); + + YAZ_CHECK(conf_service_add_sortkey( + service, 0, "relevance", + Metadata_sortkey_relevance)); + + YAZ_CHECK(conf_service_add_sortkey( + service, 1, "title", + Metadata_sortkey_string)); - YAZ_CHECK(conf_service_add_sortkey(nmem, service, 2, "year", - Metadata_sortkey_numeric)); + YAZ_CHECK(conf_service_add_sortkey( + service, 2, "year", + Metadata_sortkey_numeric)); @@ -151,7 +163,9 @@ int main(int argc, char **argv) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +