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

diff --git a/src/pazpar2.h b/src/pazpar2.h
index 4ee4c0f..f7c8175 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;
@@ -58,13 +66,33 @@ struct host {
 struct database {
     struct host *host;
     char *url;
+    char *name;
     char **databases;
     int errors;
-    struct conf_queryprofile *qprofile;
-    struct conf_retrievalprofile *rprofile;
+    struct zr_explain *explain;
+    struct setting **settings;
     struct database *next;
+    CCL_bibset ccl_map;
+    yaz_marc_t yaz_marc;
+    struct database_retrievalmap *map;
 };
 
+// Normalization filter chain. Turns incoming record into internal representation
+struct database_retrievalmap {
+    xsltStylesheet *stylesheet;
+    struct database_retrievalmap *next;
+};
+
+struct database_criterion_value {
+    char *value;
+    struct database_criterion_value *next;
+};
+
+struct database_criterion {
+    char *name;
+    struct database_criterion_value *values;
+    struct database_criterion *next;
+};
 
 // Represents a physical, reusable  connection to a remote Z39.50 host
 struct connection {
@@ -139,6 +167,7 @@ struct session {
     int expected_maxrecs;
     int total_hits;
     int total_records;
+    int total_merged;
 };
 
 struct statistics {
@@ -156,7 +185,8 @@ struct statistics {
 };
 
 struct hitsbytarget {
-    char id[256];
+    char *id;
+    char *name;
     int hits;
     int diagnostic;
     int records;
@@ -165,6 +195,11 @@ struct hitsbytarget {
 };
 
 struct parameters {
+    char proxy_override[128];
+    char listener_override[128];
+    char zproxy_override[128];
+    char settings_path_override[128];
+    struct conf_server *server;
     int dump_records;
     int timeout;		/* operations timeout, in seconds */
     char implementationId[128];
@@ -174,21 +209,20 @@ struct parameters {
     int session_timeout;
     int toget;
     int chunk;
-    CCL_bibset ccl_filter;
-    yaz_marc_t yaz_marc;
     ODR odr_out;
     ODR odr_in;
 };
 
 struct hitsbytarget *hitsbytarget(struct session *s, int *count);
-int select_targets(struct session *se);
+int select_targets(struct session *se, struct database_criterion *crit);
 struct session *new_session();
 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);
+char *search(struct session *s, char *query, char *filter);
+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);