X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Freclists.h;h=a3d36ce8d8452c710813d0cf07b2776b244f79db;hb=HEAD;hp=e75b5da2bd14bdd5d1ef3407c0fd4c4851467246;hpb=f5d345051217a4f54a53dac5a7397f5672e305ad;p=pazpar2-moved-to-github.git

diff --git a/src/reclists.h b/src/reclists.h
index e75b5da..a3d36ce 100644
--- a/src/reclists.h
+++ b/src/reclists.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2009 Index Data
+   Copyright (C) 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
@@ -22,57 +22,41 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "pazpar2_config.h"
 #include "record.h"
+#include "relevance.h"
 
-struct reclist
-{
-    struct reclist_bucket **hashtable;
-    int hashtable_size;
-    int hashmask;
-
-    struct record_cluster **flatlist;
-    int flatlist_size;
-    int num_records;
-    int pointer;
-
-    NMEM nmem;
-};
+struct reclist;
 
 // This is a recipe for sorting. First node in list has highest priority
 struct reclist_sortparms
 {
     int offset;
-    enum conf_sortkey_type type;
+    enum conf_metadata_type type;
     int increasing;
+    char *name;
     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,
-                                       struct record  *record,
-                                       char *merge_key, int *total);
+struct reclist *reclist_create(NMEM);
+void reclist_destroy(struct reclist *l);
+void reclist_limit(struct reclist *l, struct session *session, int lazy);
+struct record_cluster *reclist_insert(struct reclist *tl,
+                                      struct relevance *r,
+                                      struct conf_service *service,
+                                      struct record  *record,
+                                      struct record_metadata_attr *merge_keys, 
+                                      int *total);
 void reclist_sort(struct reclist *l, struct reclist_sortparms *parms);
 struct record_cluster *reclist_read_record(struct reclist *l);
+void reclist_enter(struct reclist *l);
+void reclist_leave(struct reclist *l);
 void reclist_rewind(struct reclist *l);
 struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms,
     struct conf_service *service);
 
+int reclist_get_num_records(struct reclist *l);
+struct record_cluster *reclist_get_cluster(struct reclist *l, int i);
+int reclist_sortparms_cmp(struct reclist_sortparms *sort1, struct reclist_sortparms *sort2);
+
 #endif
 
 /*