X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest_record.c;h=b55aa7c8447fc0abe2dad2de6111641485fb59af;hb=a6b5e633581cbae0759c3b68faa7a0cd0197f790;hp=06398b566cbe988c67e050671ccb4afacde48bda;hpb=e107b0011a295ccc61502d6e5ea79d9125a3fbb4;p=pazpar2-moved-to-github.git

diff --git a/src/test_record.c b/src/test_record.c
index 06398b5..b55aa7c 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
@@ -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
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <yaz/test.h>
 
-#include "config.h"
+#include "pazpar2_config.h"
 #include "record.h"
 
 
@@ -43,43 +43,55 @@ void test_record(int argc, char **argv)
   struct client *client = 0;
   char * bla = "blabla";
   union data_types data_text;
+  union data_types data_num;
+  struct record_metadata * tmp_md = 0;
+
   data_text.text.disp = bla;
   data_text.text.sort = bla;
 
-  
-  union data_types data_num;
   data_num.number.min = 2;
   data_num.number.max = 5;
 
-  struct record_metadata * tmp_md = 0;
 
   service =  conf_service_create(nmem, 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(
+                nmem, 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(
+                nmem, 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(
+                nmem, 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(
+                nmem, 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(
+                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_sortkey(nmem, service, 2, "year",
-                                     Metadata_sortkey_numeric));
+  YAZ_CHECK(conf_service_add_sortkey(
+                nmem, 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
  */
+