X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_record.c;h=b035c4a644e19f64306e20047cbdb2cd3114a93b;hb=142c8c510a7b23c633272c656e45277e4ec35d30;hp=b5643d07d5cfdf99d8d0a9a743aceb30ba3bed37;hpb=70cdb5e208e33b88f2a95e45c36605753de4edd5;p=pazpar2-moved-to-github.git

diff --git a/src/test_record.c b/src/test_record.c
index b5643d0..b035c4a 100644
--- a/src/test_record.c
+++ b/src/test_record.c
@@ -1,7 +1,5 @@
-/* $Id: test_record.c,v 1.3 2007-04-24 22:17:05 marc Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2008 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,24 +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
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <signal.h>
-#include <ctype.h>
-#include <assert.h>
+*/
 
 #if HAVE_CONFIG_H
-#include "cconfig.h"
+#include <config.h>
 #endif
 
 #define USE_TIMING 0
@@ -41,11 +28,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <yaz/test.h>
 
-
-//#include "pazpar2.h"
-#include "config.h"
+#include "pazpar2_config.h"
 #include "record.h"
-//#include "pazpar2.h"
+
 
 
 void test_record(int argc, char **argv)
@@ -56,25 +41,36 @@ void test_record(int argc, char **argv)
   struct record *record = 0;
 
   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;
+
+  data_num.number.min = 2;
+  data_num.number.max = 5;
+
 
   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,
-                            1, 1, 1, 0));
+                            Metadata_setting_no, 1, 1, 1, 0));
 
   YAZ_CHECK(conf_service_add_metadata(nmem, service, 1, "author",
                             Metadata_type_generic, Metadata_merge_longest,
-                            1, 1, 1, 0));
+                            Metadata_setting_no,1, 1, 1, 0));
 
   YAZ_CHECK(conf_service_add_metadata(nmem, service, 2, "isbn",
                             Metadata_type_number, Metadata_merge_no,
-                            1, 1, 1, 0));
+                            Metadata_setting_no, 1, 1, 1, 0));
 
   YAZ_CHECK(conf_service_add_metadata(nmem, service, 3, "year",
                             Metadata_type_year, Metadata_merge_range,
-                            1, 1, 1, 0));
+                            Metadata_setting_no, 1, 1, 1, 0));
 
   YAZ_CHECK(conf_service_add_sortkey(nmem, service, 0, "relevance",
                                      Metadata_sortkey_relevance));
@@ -89,22 +85,9 @@ void test_record(int argc, char **argv)
 
 
   // testing record things
-  record = record_create(nmem, 4, 3);
+  record = record_create(nmem, 4, 3, client, 1);
   YAZ_CHECK(record);
 
-  // why on earth do we have a client dangeling from the record ??
-  record->client = client;
-
-  char * bla = "blabla";
-  union data_types data_text;
-  data_text.text = bla;
-
-  
-  union data_types data_num;
-  data_num.number.min = 2;
-  data_num.number.max = 5;
-
-  struct record_metadata * tmp_md = 0;
   tmp_md = record_metadata_insert(nmem, &(record->metadata[0]), data_text);
   YAZ_CHECK(tmp_md);
   YAZ_CHECK(0 == record->metadata[0]->next);