X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Freclists.h;h=a3d36ce8d8452c710813d0cf07b2776b244f79db;hb=817e3ec506c4095bc4fcc1923cee36153ef4ee43;hp=4b0e450bc176bc8df6bd60afc82535ff04b65abd;hpb=c1422565e829e8534267b052ea6c2ba4ce4059ec;p=pazpar2-moved-to-github.git

diff --git a/src/reclists.h b/src/reclists.h
index 4b0e450..a3d36ce 100644
--- a/src/reclists.h
+++ b/src/reclists.h
@@ -1,7 +1,5 @@
-/* $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.
+/* This file is part of Pazpar2.
+   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
@@ -14,72 +12,59 @@ 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
+
+*/
 
 #ifndef RECLISTS_H
 #define RECLISTS_H
 
-#include "config.h"
+#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,
-                                       const 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 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
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+