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

diff --git a/src/test_record.c b/src/test_record.c
index 54317e1..99502b4 100644
--- a/src/test_record.c
+++ b/src/test_record.c
@@ -1,4 +1,4 @@
-/* $Id: test_record.c,v 1.2 2007-04-24 13:50:07 marc Exp $
+/* $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.
@@ -19,17 +19,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, 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"
 #endif
@@ -41,11 +30,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <yaz/test.h>
 
-
-//#include "pazpar2.h"
 #include "config.h"
 #include "record.h"
-//#include "pazpar2.h"
+
 
 
 void test_record(int argc, char **argv)
@@ -56,25 +43,35 @@ void test_record(int argc, char **argv)
   struct record *record = 0;
 
   struct client *client = 0;
+  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;
 
   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 +86,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);
@@ -125,9 +109,15 @@ void test_record(int argc, char **argv)
   YAZ_CHECK(record->metadata[1]->next);
 
 
+  YAZ_CHECK(0 == record->sortkeys[0]);
   YAZ_CHECK(record_assign_sortkey_field_id(nmem, record, 0, data_text));
+  YAZ_CHECK(record->sortkeys[0]);
+  YAZ_CHECK(0 == record->sortkeys[1]);
   YAZ_CHECK(record_assign_sortkey_field_id(nmem, record, 1, data_text));
+  YAZ_CHECK(record->sortkeys[1]);
+  YAZ_CHECK(0 == record->sortkeys[2]);
   YAZ_CHECK(record_assign_sortkey_field_id(nmem, record, 2, data_num));
+  YAZ_CHECK(record->sortkeys[2]);
 
 
   YAZ_CHECK(record_assign_sortkey(nmem, record, service, "relevance", data_text));