X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_config.c;h=3d7e0915ca5d4096ec1cdd25b4405f16212c2c49;hb=cce5da278d7ce802452bbc14b4c2d577f638291b;hp=f6df5317ba3cc8c2f2265905aedf5a43982ed771;hpb=5a145dc87e4756afc3e247cded32a9666457f065;p=pazpar2-moved-to-github.git

diff --git a/src/test_config.c b/src/test_config.c
index f6df531..3d7e091 100644
--- a/src/test_config.c
+++ b/src/test_config.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
@@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #if HAVE_CONFIG_H
-#include "cconfig.h"
+#include <config.h>
 #endif
 
 #define USE_TIMING 0
@@ -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",
-                                      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,
-                                       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,
-                                       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,
-                                       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,
-                                       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,
-                                      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,
-                                       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,
-                                       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,
-                                       Metadata_setting_no,
-                                      1, 1, 1, 0));
+                                      Metadata_setting_no,
+                                      1, 1, 1, 0,
+                                      Metadata_mergekey_no));
 
 
   // expected sortkey failures
@@ -157,7 +166,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
  */
+