X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.h;h=ee89ef018a5bd23d573b0b58e8b540ef5c6f7dc2;hb=eee51a2aad552b76fc37817065d9beeb57a196c2;hp=b2d3d95794eaf4ac48518e24d29f83d87531276a;hpb=ab6726a5092819765b5f68723c040db17444a86d;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.h b/src/pazpar2.h
index b2d3d95..ee89ef0 100644
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -15,17 +15,41 @@ 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 data_types data;
+    struct record_metadata *next; // next item of this name
+};
 
 struct record {
     struct client *client;
-    int target_offset;
-    char *buf;
+    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;
-    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;
@@ -42,12 +66,25 @@ struct host {
 struct database {
     struct host *host;
     char *url;
+    char *name;
     char **databases;
     int errors;
+    struct zr_explain *explain;
+    struct conf_queryprofile *qprofile;
+    struct conf_retrievalprofile *rprofile;
     struct database *next;
 };
 
-struct client;
+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 {
@@ -94,8 +131,16 @@ struct client {
 #define SESSION_WATCH_RECORDS   0
 #define SESSION_WATCH_MAX       0
 
+#define SESSION_MAX_TERMLISTS 10
+
 typedef void (*session_watchfun)(void *data);
 
+struct named_termlist
+{
+    char *name;
+    struct termlist *termlist;
+};
+
 // End-user session
 struct session {
     struct client *clients;
@@ -103,15 +148,18 @@ struct session {
     char query[1024];
     NMEM nmem;          // Nmem for each operation (i.e. search)
     WRBUF wrbuf;        // Wrbuf for scratch(i.e. search)
-    struct termlist *termlist;
+    int num_termlists;
+    struct named_termlist termlists[SESSION_MAX_TERMLISTS];
     struct relevance *relevance;
     struct reclist *reclist;
     struct {
         void *data;
         session_watchfun fun;
     } watchlist[SESSION_WATCH_MAX + 1];
+    int expected_maxrecs;
     int total_hits;
     int total_records;
+    int total_merged;
 };
 
 struct statistics {
@@ -129,7 +177,8 @@ struct statistics {
 };
 
 struct hitsbytarget {
-    char id[256];
+    char *id;
+    char *name;
     int hits;
     int diagnostic;
     int records;
@@ -138,6 +187,12 @@ struct hitsbytarget {
 };
 
 struct parameters {
+    char proxy_override[128];
+    char listener_override[128];
+    char zproxy_override[128];
+    char settings_path[128];
+    struct conf_server *server;
+    int dump_records;
     int timeout;		/* operations timeout, in seconds */
     char implementationId[128];
     char implementationName[128];
@@ -150,19 +205,21 @@ struct parameters {
     yaz_marc_t yaz_marc;
     ODR odr_out;
     ODR odr_in;
-    xsltStylesheetPtr xsl;
 };
 
 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);
-struct termlist_score **termlist(struct session *s, int *num);
+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);
 
 #endif