X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.h;h=50b0a1b5677a44cd8de8f3689ef859d723dc8fa8;hb=cf54154bcc2312c9009ec34b737aaea431b1b831;hp=7677d9d5907496ded47bcde245a6b30dcc9b3242;hpb=dde4a5914bbb5511a91e73d8ab45210b48637596;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.h b/src/pazpar2.h
index 7677d9d..50b0a1b 100644
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -20,14 +20,31 @@ struct record;
 
 struct client;
 
+struct record_metadata {
+    union {
+        char *text;
+        struct {
+            int year1;
+            int year2;
+        } year;
+    } data;
+    struct record_metadata *next; // next item of this name
+};
+
 struct record {
     struct client *client;
-    int target_offset;
+    struct record_metadata **metadata; // Array mirrors list of metadata 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
     char *merge_key;
-    char *title;
     int relevance;
     int *term_frequency_vec;
-    struct record *next_cluster;
+    int recid; // Set-specific ID for this record
+    struct record *records;
 };
 
 struct connection;
@@ -125,6 +142,7 @@ struct session {
     int expected_maxrecs;
     int total_hits;
     int total_records;
+    int total_merged;
 };
 
 struct statistics {
@@ -151,6 +169,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];
@@ -173,9 +194,12 @@ 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, 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);
 
 #endif