X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsession.h;h=6a4bf315cc86a635348aeb7df2c92c08a2b9c8e9;hb=b0797dd6ff756c6e7f66b0dc9f2848e0022cf1fb;hp=a74c7ccfc28b5e4f0903ecb05c4eff8683d2bac6;hpb=c7ce18b91b4b542af4f02ad9fa3f86f12b92f3d1;p=pazpar2-moved-to-github.git

diff --git a/src/session.h b/src/session.h
index a74c7cc..6a4bf31 100644
--- a/src/session.h
+++ b/src/session.h
@@ -119,7 +119,7 @@ struct session {
     YAZ_MUTEX session_mutex;
     unsigned session_id;
     int settings_modified;
-    struct session_sorted_results *sorted_results;
+    struct reclist_sortparms *sorted_results;
 };
 
 struct statistics {
@@ -138,9 +138,11 @@ struct hitsbytarget {
     const char *id;
     const char *name;
     Odr_int hits;
+    Odr_int approximation;
     int diagnostic;
     const char *addinfo;
     int records;
+    int filtered;
     const char *state;
     int connected;
     char *settings_xml;
@@ -154,26 +156,24 @@ 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);
 
 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);
 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 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);
@@ -185,8 +185,7 @@ void session_alert_watch(struct session *s, int what);
 void add_facet(struct session *s, const char *type, const char *value, int count);
 
 
-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)))
@@ -194,12 +193,6 @@ void session_log(struct session *s, int level, const char *fmt, ...)
     ;
 #endif
 
-struct session_sorted_results {
-    const char *field;
-    int increasing;
-    struct session_sorted_results *next;
-};
-
 /*
  * Local variables:
  * c-basic-offset: 4