X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.h;h=ec5475100e08dd13f3323785316caa3770f02079;hb=b97798aabc2509f4a8e68e5714c59b0773dc4d1e;hp=4d8a16dafb7ad21d93bb26e8ab2258a03fdef05f;hpb=77b4d51d81340f3374ae8a97aea0177a0fbcd336;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.h b/src/pazpar2.h
index 4d8a16d..ec54751 100644
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -15,37 +15,40 @@ struct record;
 
 #include "termlists.h"
 #include "relevance.h"
+#include "reclists.h"
 #include "eventl.h"
 #include "config.h"
 
 struct client;
 
+union data_types {
+    char *text;
+    struct {
+        int min;
+        int max;
+    } number;
+};
+
 struct record_metadata {
-    union {
-        char *text;
-        struct {
-            int year1;
-            int year2;
-        } year;
-    } data;
+    union data_types 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
-    int relevance;
-    int *term_frequency_vec;
-    struct record *next;
+    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;
     int relevance;
     int *term_frequency_vec;
+    int recid; // Set-specific ID for this record
     struct record *records;
 };
 
@@ -63,6 +66,7 @@ struct host {
 struct database {
     struct host *host;
     char *url;
+    char *name;
     char **databases;
     int errors;
     struct conf_queryprofile *qprofile;
@@ -144,6 +148,7 @@ struct session {
     int expected_maxrecs;
     int total_hits;
     int total_records;
+    int total_merged;
 };
 
 struct statistics {
@@ -161,7 +166,8 @@ struct statistics {
 };
 
 struct hitsbytarget {
-    char id[256];
+    char *id;
+    char *name;
     int hits;
     int diagnostic;
     int records;
@@ -170,6 +176,8 @@ 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 */
@@ -193,8 +201,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_cluster **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);