X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=src%2Fpazpar2.h;h=4d8a16dafb7ad21d93bb26e8ab2258a03fdef05f;hb=77b4d51d81340f3374ae8a97aea0177a0fbcd336;hp=b2d3d95794eaf4ac48518e24d29f83d87531276a;hpb=ab6726a5092819765b5f68723c040db17444a86d;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.h b/src/pazpar2.h
index b2d3d95..4d8a16d 100644
--- a/src/pazpar2.h
+++ b/src/pazpar2.h
@@ -16,16 +16,37 @@ struct record;
 #include "termlists.h"
 #include "relevance.h"
 #include "eventl.h"
+#include "config.h"
+
+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;
-    char *buf;
+    struct record_metadata **metadata; // Array mirrors list of metadata fields in config
+    int relevance;
+    int *term_frequency_vec;
+    struct record *next;
+};
+
+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;
+    struct record *records;
 };
 
 struct connection;
@@ -44,10 +65,11 @@ struct database {
     char *url;
     char **databases;
     int errors;
+    struct conf_queryprofile *qprofile;
+    struct conf_retrievalprofile *rprofile;
     struct database *next;
 };
 
-struct client;
 
 // Represents a physical, reusable  connection to a remote Z39.50 host
 struct connection {
@@ -94,8 +116,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,13 +133,15 @@ 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;
 };
@@ -138,6 +170,8 @@ struct hitsbytarget {
 };
 
 struct parameters {
+    struct conf_server *server;
+    int dump_records;
     int timeout;		/* operations timeout, in seconds */
     char implementationId[128];
     char implementationName[128];
@@ -150,7 +184,6 @@ struct parameters {
     yaz_marc_t yaz_marc;
     ODR odr_out;
     ODR odr_in;
-    xsltStylesheetPtr xsl;
 };
 
 struct hitsbytarget *hitsbytarget(struct session *s, int *count);
@@ -160,9 +193,11 @@ 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);
+struct record_cluster **show(struct session *s, int start, int *num, int *total,
+                     int *sumhits, NMEM nmem_show);
+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