X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsession.h;h=ad94e2951228f33d45d0983469b36cf9b4f68a3d;hb=f1af7094481beba15c9ce3349095681db5981b28;hp=54ccd6c56408c73e3d3005ecff37425130dfb7e0;hpb=7b13bb9165493bdef71e929ebcdc02b6a6605aca;p=pazpar2-moved-to-github.git

diff --git a/src/session.h b/src/session.h
index 54ccd6c..ad94e29 100644
--- a/src/session.h
+++ b/src/session.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2011 Index Data
+   Copyright (C) 2006-2013 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/ccl.h>
 #include <yaz/yaz-ccl.h>
 
+#include "facet_limit.h"
 #include "termlists.h"
 #include "reclists.h"
 #include "http.h"
@@ -102,13 +103,15 @@ struct client_list;
 struct session {
     struct conf_service *service; /* service in use for this session */
     struct session_database *databases;  // All databases, settings overriden
-    struct client_list *clients;   // Clients connected for current search
+    struct client_list *clients_active; // Clients connected for current search
+    struct client_list *clients_cached; // Clients in cache
     NMEM session_nmem;  // Nmem for session-permanent storage
     NMEM nmem;          // Nmem for each operation (i.e. search, result set, etc)
     int num_termlists;
     struct named_termlist termlists[SESSION_MAX_TERMLISTS];
     struct relevance *relevance;
     struct reclist *reclist;
+    char *mergekey;
     struct session_watchentry watchlist[SESSION_WATCH_MAX + 1];
     int total_records;
     int total_merged;
@@ -117,7 +120,9 @@ struct session {
     normalize_cache_t normalize_cache;
     YAZ_MUTEX session_mutex;
     unsigned session_id;
-    struct session_sorted_results *sorted_results;
+    int settings_modified;
+    facet_limits_t facet_limits;
+    struct reclist_sortparms *sorted_results;
 };
 
 struct statistics {
@@ -136,8 +141,12 @@ struct hitsbytarget {
     const char *id;
     const char *name;
     Odr_int hits;
+    Odr_int approximation;
     int diagnostic;
+    const char *message;
+    const char *addinfo;
     int records;
+    int filtered;
     const char *state;
     int connected;
     char *settings_xml;
@@ -151,26 +160,31 @@ void session_destroy(struct session *s);
 void session_init_databases(struct session *s);
 void statistics(struct session *s, struct statistics *stat);
 
-void session_sort(struct session *se, const char *field, int increasing);
+void session_sort(struct session *se, struct reclist_sortparms *sp,
+                  const char *mergekey);
 
 enum pazpar2_error_code session_search(struct session *s, const char *query,
                                        const char *startrecs,
                                        const char *maxrecs,
                                        const char *filter, const char *limit,
                                        const char **addinfo,
-                                       const char *sort_field, int increasing);
+                                       struct reclist_sortparms *sort_parm,
+                                       const char *mergekey);
 struct record_cluster **show_range_start(struct session *s,
                                          struct reclist_sortparms *sp,
                                          int start,
-                                         int *num, int *total, Odr_int *sumhits);
+                                         int *num, int *total,
+                                         Odr_int *sumhits,
+                                         Odr_int *approximation,
+                                         void (*ready)(void *data),
+                                         struct http_channel *chan);
+int session_fetch_more(struct session *s);
 void show_range_stop(struct session *s, struct record_cluster **recs);
 
 struct record_cluster *show_single_start(struct session *s, const char *id,
                                          struct record_cluster **prev_r,
                                          struct record_cluster **next_r);
 void show_single_stop(struct session *s, struct record_cluster *rec);
-struct termlist_score **get_termlist_score(struct session *s,
-                                           const char *name, int *num);
 int session_set_watch(struct session *s, int what, session_watchfun fun, void *data, struct http_channel *c);
 int session_active_clients(struct session *s);
 int session_is_preferred_clients_ready(struct session *s);
@@ -181,9 +195,9 @@ int ingest_record(struct client *cl, const char *rec, int record_no, NMEM nmem);
 void session_alert_watch(struct session *s, int what);
 void add_facet(struct session *s, const char *type, const char *value, int count);
 
+int session_check_cluster_limit(struct session *se, struct record_cluster *rec);
 
-void perform_termlist(struct http_channel *c, struct session *se,
-                      const char *name, int num);
+void perform_termlist(struct http_channel *c, struct session *se, const char *name, int num, int version);
 void session_log(struct session *s, int level, const char *fmt, ...)
 #ifdef __GNUC__
     __attribute__ ((format (printf, 3, 4)))