X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.h;h=85ebd587fb529bed25c719a2085c85f4f238dbf0;hb=7dd217c5530b60f6533fff8e3420d755c5db5e25;hp=4ee4c0fb181b59a29a86fc8525e438917bb1c7c1;hpb=5c0b5b368867a9b8fe6c3ffe7887890584ee9643;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.h b/src/pazpar2.h
index 4ee4c0f..85ebd58 100644
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -15,33 +15,41 @@ struct record;
 
 #include "termlists.h"
 #include "relevance.h"
+#include "reclists.h"
 #include "eventl.h"
 #include "config.h"
 
 struct client;
 
-struct record_metadata
-{
-    union
-    {
-        char *text;
-        struct {
-            int first;
-            int last;
-        } year_range;
-        int year;
-    } interpretation;
+union data_types {
+    char *text;
+    struct {
+        int min;
+        int max;
+    } number;
+};
+
+struct record_metadata {
+    union data_types data;
+    struct record_metadata *next; // next item of this name
 };
 
 struct record {
     struct client *client;
-    char *title;
-    int target_offset;
+    struct record_metadata **metadata; // Array mirrors list of metadata fields in config
+    union data_types **sortkeys;       // Array mirrors list of sortkey fields in config
+    struct record *next;  // Next in cluster of merged records
+};
+
+struct record_cluster
+{
+    struct record_metadata **metadata; // Array mirrors list of metadata fields in config
+    union data_types **sortkeys;
     char *merge_key;
-    struct record_metadata *md;
     int relevance;
     int *term_frequency_vec;
-    struct record *next_cluster;
+    int recid; // Set-specific ID for this record
+    struct record *records;
 };
 
 struct connection;
@@ -139,6 +147,7 @@ struct session {
     int expected_maxrecs;
     int total_hits;
     int total_records;
+    int total_merged;
 };
 
 struct statistics {
@@ -165,6 +174,9 @@ struct hitsbytarget {
 };
 
 struct parameters {
+    char proxy_override[128];
+    char listener_override[128];
+    struct conf_server *server;
     int dump_records;
     int timeout;		/* operations timeout, in seconds */
     char implementationId[128];
@@ -187,8 +199,9 @@ void destroy_session(struct session *s);
 int load_targets(struct session *s, const char *fn);
 void statistics(struct session *s, struct statistics *stat);
 char *search(struct session *s, char *query);
-struct record **show(struct session *s, int start, int *num, int *total,
-                     int *sumhits, NMEM nmem_show);
+struct record_cluster **show(struct session *s, struct reclist_sortparms *sp, int start,
+        int *num, int *total, int *sumhits, NMEM nmem_show);
+struct record_cluster *show_single(struct session *s, int id);
 struct termlist_score **termlist(struct session *s, const char *name, int *num);
 void session_set_watch(struct session *s, int what, session_watchfun fun, void *data);
 int session_active_clients(struct session *s);