X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsession.h;h=49e5338e77471f1dc8df4faf46c82733052ac8d0;hb=2e6ca38ba48b41f025b5740bf33a42afbefd4641;hp=b6b3ca266a72c53e833834d758413f9bdcfa4af9;hpb=47468fed198c86bb88662873264bb6f432f101bf;p=pazpar2-moved-to-github.git diff --git a/src/session.h b/src/session.h index b6b3ca2..49e5338 100644 --- a/src/session.h +++ b/src/session.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2012 Index Data + Copyright (C) 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,9 +25,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include -#include "termlists.h" +#include "facet_limit.h" +#include "relevance.h" #include "reclists.h" -#include "http.h" struct record; struct client; @@ -53,15 +53,6 @@ enum pazpar2_error_code { PAZPAR2_LAST_ERROR }; -// Represents a database -struct database { - char *id; - int num_settings; - struct setting **settings; - struct database *next; -}; - - // Represents a database as viewed from one session, possibly with settings overriden // for that session struct session_database @@ -80,14 +71,13 @@ struct session_database #define SESSION_WATCH_BYTARGET 4 #define SESSION_WATCH_MAX 4 -#define SESSION_MAX_TERMLISTS 10 - typedef void (*session_watchfun)(void *data); struct named_termlist { char *name; struct termlist *termlist; + struct named_termlist *next; }; struct session_watchentry { @@ -106,10 +96,11 @@ struct session { 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 named_termlist *termlists; struct relevance *relevance; struct reclist *reclist; + char *mergekey; + char *rank; struct session_watchentry watchlist[SESSION_WATCH_MAX + 1]; int total_records; int total_merged; @@ -119,7 +110,10 @@ struct session { YAZ_MUTEX session_mutex; unsigned session_id; int settings_modified; - struct session_sorted_results *sorted_results; + facet_limits_t facet_limits; + int clients_starting; + struct reclist_sortparms *sorted_results; + struct facet_id *facet_id_list; }; struct statistics { @@ -140,6 +134,7 @@ struct hitsbytarget { Odr_int hits; Odr_int approximation; int diagnostic; + const char *message; const char *addinfo; int records; int filtered; @@ -147,27 +142,39 @@ struct hitsbytarget { int connected; char *settings_xml; char *suggestions_xml; + const char *query_type; + const char *query_data; }; struct hitsbytarget *get_hitsbytarget(struct session *s, int *count, NMEM nmem); struct session *new_session(NMEM nmem, struct conf_service *service, unsigned session_id); +int sessions_count(void); 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, int clear_set); +void session_sort(struct session *se, struct reclist_sortparms *sp, + const char *mergekey, const char *rank); 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); + const char **addinfo2, + struct reclist_sortparms *sort_parm, + const char *mergekey, + const char *rank); struct record_cluster **show_range_start(struct session *s, struct reclist_sortparms *sp, int start, - int *num, int *total, Odr_int *sumhits, Odr_int *approximation); + 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, @@ -177,15 +184,24 @@ void show_single_stop(struct session *s, struct record_cluster *rec); 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); -void session_apply_setting(struct session *se, char *dbname, char *setting, char *value); +void session_apply_setting(struct session *se, const char *dbname, + const char *setting, const char *value); const char *session_setting_oneval(struct session_database *db, int offset); +void session_stop(struct session *se); int ingest_record(struct client *cl, const char *rec, int record_no, NMEM nmem); +int ingest_xml_record(struct client *cl, xmlDoc *xdoc, + int record_no, NMEM nmem, int cached_copy); void session_alert_watch(struct session *s, int what); -void add_facet(struct session *s, const char *type, const char *value, int count); +void add_facet(struct session *s, const char *type, const char *value, int count, struct client *cl); +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, int version); + +const char *session_lookup_id_facet(struct session *s, struct client *cl, + const char *type, const char *term); + void session_log(struct session *s, int level, const char *fmt, ...) #ifdef __GNUC__ __attribute__ ((format (printf, 3, 4))) @@ -193,12 +209,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