X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fsession.h;h=ea2cb0132dfc5f23719504ee8bbe8b5186399e63;hb=50aa60919772aeee3ac23a4a5e67a3d6e09a4770;hp=a8199226ca83b1d15001805829fb521695f1eab1;hpb=5957bba20fb93c8c6829296d6ccf32e52b2114e2;p=pazpar2-moved-to-github.git diff --git a/src/session.h b/src/session.h index a819922..ea2cb01 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-2012 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 @@ -138,8 +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; @@ -153,7 +156,7 @@ 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, const char *field, int increasing, int clear_set); enum pazpar2_error_code session_search(struct session *s, const char *query, const char *startrecs, @@ -164,15 +167,13 @@ enum pazpar2_error_code session_search(struct session *s, const char *query, 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); @@ -184,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))) @@ -196,6 +196,7 @@ void session_log(struct session *s, int level, const char *fmt, ...) struct session_sorted_results { const char *field; int increasing; + int position; struct session_sorted_results *next; };