added interface for adding sort parameters for record lists, use like this

reclist_sortparms_insert(nmem, &sort_parms, service, "title", 1)
adde unit test of the same

diff --git a/src/reclists.c b/src/reclists.c
index 52f30f5..bbf3510 100644 (file)
--- a/src/reclists.c
+++ b/src/reclists.c
@@ -1,4 +1,4 @@
-/* $Id: reclists.c,v 1.14 2007-04-25 09:23:03 marc Exp $
+/* $Id: reclists.c,v 1.15 2007-04-25 13:09:17 marc Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -41,6 +41,58 @@ struct reclist_bucket
     struct reclist_bucket *next;
 };
 
+struct reclist_sortparms * 
+reclist_sortparms_insert_field_id(NMEM nmem,
+                         struct reclist_sortparms **sortparms,
+                         int field_id,
+                         enum conf_sortkey_type type,
+                         int increasing)
+{
+    struct reclist_sortparms * tmp_rlsp = 0;
+    // assert(nmem);
+
+    if(!sortparms || field_id < 0)
+        return 0;
+
+    // construct new reclist_sortparms
+    tmp_rlsp  = nmem_malloc(nmem, sizeof(struct reclist_sortparms));
+    tmp_rlsp->offset = field_id;
+    tmp_rlsp->type = type;
+    tmp_rlsp->increasing = increasing;
+
+
+    // insert in *sortparms place, moving *sortparms one down the list
+    tmp_rlsp->next = *sortparms;
+    *sortparms = tmp_rlsp;
+
+    return *sortparms;
+};
+
+
+struct reclist_sortparms * 
+reclist_sortparms_insert(NMEM nmem, 
+                         struct reclist_sortparms **sortparms,
+                         struct conf_service * service,
+                         const char * name,
+                         int increasing)
+{
+    int field_id = 0;
+
+    if (!sortparms || !service || !name)  
+        return 0;
+    
+    field_id = conf_service_sortkey_field_id(service, name);
+
+    if (-1 == field_id)
+        return 0;
+
+    return reclist_sortparms_insert_field_id(nmem, sortparms, field_id,
+                                             service->sortkeys[field_id].type,
+                                             increasing);
+};
+
+
+
 struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms)
 {
     struct reclist_sortparms *res = 0;

diff --git a/src/reclists.h b/src/reclists.h
index 8cc7d2b..4b0e450 100644 (file)
--- a/src/reclists.h
+++ b/src/reclists.h
@@ -1,4 +1,4 @@
-/* $Id: reclists.h,v 1.9 2007-04-25 08:07:47 marc Exp $
+/* $Id: reclists.h,v 1.10 2007-04-25 13:09:17 marc Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -48,6 +48,22 @@ struct reclist_sortparms
     struct reclist_sortparms *next;
 };
 
+struct reclist_sortparms * 
+reclist_sortparms_insert_field_id(NMEM nmem,
+                                  struct reclist_sortparms **sortparms,
+                                  int field_id ,
+                                  enum conf_sortkey_type type,
+                                  int increasing);
+
+
+struct reclist_sortparms * 
+reclist_sortparms_insert(NMEM nmem, 
+                         struct reclist_sortparms **sortparms,
+                         struct conf_service * service,
+                         const char * name,
+                         int increasing);
+
+
 struct reclist *reclist_create(NMEM, int numrecs);
 struct record_cluster *reclist_insert( struct reclist *tl,
                                        struct conf_service *service,

diff --git a/src/test_reclists.c b/src/test_reclists.c
new file mode 100644 (file)
index 0000000..94d0db6
--- /dev/null
+++ b/src/test_reclists.c
@@ -0,0 +1,99 @@
+/* $Id: test_reclists.c,v 1.1 2007-04-25 13:09:17 marc Exp $
+   Copyright (c) 2006-2007, Index Data.
+
+This file is part of Pazpar2.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+ */
+
+#if HAVE_CONFIG_H
+#include "cconfig.h"
+#endif
+
+#define USE_TIMING 0
+#if USE_TIMING
+#include <yaz/timing.h>
+#endif
+
+#include <yaz/test.h>
+
+
+#include "config.h"
+//#include "record.h"
+#include "reclists.h"
+
+
+void test_reclist_sortparms(int argc, char **argv)
+{
+  NMEM         nmem = nmem_create();
+
+  struct conf_service *service = 0; 
+  service =  conf_service_create(nmem, 1, 2);
+
+  conf_service_add_metadata(nmem, service, 0, "title",
+                            Metadata_type_generic, Metadata_merge_unique,
+                            1, 1, 1, 0);
+
+  conf_service_add_sortkey(nmem, service, 0, "relevance",
+                           Metadata_sortkey_relevance);
+  
+  conf_service_add_sortkey(nmem, service, 1, "title",
+                           Metadata_sortkey_string);
+  
+
+  // initializing of sort parameters is controlled by service descriptions
+  struct reclist_sortparms *sort_parms = 0;
+
+  // sorting ascending according to relevance, then title
+  YAZ_CHECK(0 == sort_parms);
+  YAZ_CHECK(reclist_sortparms_insert(nmem, &sort_parms, service, "title", 1));
+  YAZ_CHECK(sort_parms);
+
+  YAZ_CHECK(0 == sort_parms->next);
+  YAZ_CHECK(reclist_sortparms_insert(nmem, &sort_parms, service, 
+                                     "relevance", 1));
+  YAZ_CHECK(sort_parms->next);
+
+
+  nmem_destroy(nmem);
+
+  //YAZ_CHECK(0 == 0);
+  //YAZ_CHECK_EQ(0, 1);
+}
+
+
+int main(int argc, char **argv)
+{
+    YAZ_CHECK_INIT(argc, argv); 
+    YAZ_CHECK_LOG(); 
+
+
+    test_reclist_sortparms(argc, argv); 
+
+    
+    YAZ_CHECK_TERM;
+}
+
+
+
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */