X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_config.c;h=21b3e5dd410343f0ee90bc274592eb51ce7864f5;hb=5b4ea0cf66dd82c871ed7d69a5801d78789087b2;hp=5cd74560d1614dc36f33ba8ec794d97754197b16;hpb=a9527ef447794713570f93f8cddef6e352536f6b;p=pazpar2-moved-to-github.git diff --git a/src/test_config.c b/src/test_config.c index 5cd7456..21b3e5d 100644 --- a/src/test_config.c +++ b/src/test_config.c @@ -1,7 +1,5 @@ -/* $Id: test_config.c,v 1.4 2007-07-30 23:16:33 quinn Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + 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 @@ -14,13 +12,13 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Pazpar2; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ #if HAVE_CONFIG_H -#include "cconfig.h" +#include #endif #define USE_TIMING 0 @@ -30,116 +28,99 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include -#include "config.h" +#include "pazpar2_config.h" void test_conf_service(int argc, char **argv) { - NMEM nmem = nmem_create(); - - struct conf_service *service = 0; - service = conf_service_create(nmem, 4, 3); - - YAZ_CHECK(service); - - // 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)); - - YAZ_CHECK(!conf_service_add_metadata(nmem, 0, 0, "service_needed", - Metadata_type_generic, - Metadata_merge_unique, - Metadata_setting_no, - 1, 1, 1, 0)); - - 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)); - - 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)); - - 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)); - - // 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)); - - 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)); - - - // expected sortkey failures - YAZ_CHECK(!conf_service_add_sortkey(0, service, 0, "dead_nmem", - Metadata_sortkey_relevance)); - - YAZ_CHECK(!conf_service_add_sortkey(nmem, 0, 0, "service_neeeded", - Metadata_sortkey_numeric)); - - YAZ_CHECK(!conf_service_add_sortkey(nmem, service, -1, "out_of_bounds", - Metadata_sortkey_skiparticle)); - - YAZ_CHECK(!conf_service_add_sortkey(nmem, service, -1, "out_of_bounds", - Metadata_sortkey_string)); - - YAZ_CHECK(!conf_service_add_sortkey(nmem, service, 3, "out_of_bounds", - Metadata_sortkey_relevance)); - - YAZ_CHECK(!conf_service_add_sortkey(nmem, service, 0, 0, //missing name - Metadata_sortkey_relevance)); - - - // expected sortkey sucess - 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)); + struct conf_service *service = 0; + service = conf_service_create(0, 4, 3, 0); + + YAZ_CHECK(service); + + // expected metadata failures + YAZ_CHECK(!conf_service_add_metadata(0, 0, "service_needed", + Metadata_type_generic, + Metadata_merge_unique, + Metadata_setting_no, + 1, 1, 1, 0, + Metadata_mergekey_no)); + + YAZ_CHECK(!conf_service_add_metadata(service, -1, "out_of_bounds", + Metadata_type_generic, + Metadata_merge_unique, + Metadata_setting_no, + 1, 1, 1, 0, + Metadata_mergekey_no)); + + YAZ_CHECK(!conf_service_add_metadata(service, 4, "out_of_bounds", + Metadata_type_generic, + Metadata_merge_unique, + Metadata_setting_no, + 1, 1, 1, 0, + Metadata_mergekey_no)); + + YAZ_CHECK(!conf_service_add_metadata(service, 0, 0, //missing name + Metadata_type_generic, + Metadata_merge_unique, + Metadata_setting_no, + 1, 1, 1, 0, + Metadata_mergekey_no)); + + // expected metadata sucesses + 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)); + + + // expected sortkey failures + YAZ_CHECK(!conf_service_add_sortkey(service, -1, "out_of_bounds", + Metadata_sortkey_skiparticle)); + + YAZ_CHECK(!conf_service_add_sortkey(service, -1, "out_of_bounds", + Metadata_sortkey_string)); + + YAZ_CHECK(!conf_service_add_sortkey(service, 3, "out_of_bounds", + Metadata_sortkey_relevance)); + + YAZ_CHECK(!conf_service_add_sortkey(service, 0, 0, //missing name + Metadata_sortkey_relevance)); + + + // expected sortkey sucess + 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)); - - - - - - - nmem_destroy(nmem); - - //YAZ_CHECK(0 == 0); - //YAZ_CHECK_EQ(0, 1); - + YAZ_CHECK(conf_service_add_sortkey(service, 2, "year", + Metadata_sortkey_numeric)); } @@ -159,7 +140,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 */ +