X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_record.c;h=b55aa7c8447fc0abe2dad2de6111641485fb59af;hb=3d99aecedf9d6e6ebeadcedbee081049b03dbbf8;hp=99502b473513e1d6d28f093e9d078f71927f4a9b;hpb=a9527ef447794713570f93f8cddef6e352536f6b;p=pazpar2-moved-to-github.git

diff --git a/src/test_record.c b/src/test_record.c
index 99502b4..b55aa7c 100644
--- a/src/test_record.c
+++ b/src/test_record.c
@@ -1,7 +1,5 @@
-/* $Id: test_record.c,v 1.8 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 <config.h>
 #endif
 
 #define USE_TIMING 0
@@ -30,7 +28,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <yaz/test.h>
 
-#include "config.h"
+#include "pazpar2_config.h"
 #include "record.h"
 
 
@@ -45,42 +43,55 @@ void test_record(int argc, char **argv)
   struct client *client = 0;
   char * bla = "blabla";
   union data_types data_text;
-  data_text.text = bla;
-
-  
   union data_types data_num;
+  struct record_metadata * tmp_md = 0;
+
+  data_text.text.disp = bla;
+  data_text.text.sort = bla;
+
   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, 2, "year",
-                                     Metadata_sortkey_numeric));
+  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));
   
 
 
@@ -152,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
  */
+