X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsession.h;h=886f1b61e8fd51ca8abb8e27bc5243dcdb021665;hb=5c1b5b3aee37bbac758f7bc2ccf370cfcc6b9723;hp=4aba3373e7184cb8b1ee152013073982f176f8b1;hpb=ca9817524ebe069581ad72f6bca0e9775d61e30c;p=pazpar2-moved-to-github.git diff --git a/src/session.h b/src/session.h index 4aba337..886f1b6 100644 --- a/src/session.h +++ b/src/session.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 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 @@ -48,18 +48,14 @@ enum pazpar2_error_code { PAZPAR2_RECORD_FAIL, PAZPAR2_NOT_IMPLEMENTED, PAZPAR2_NO_SERVICE, + PAZPAR2_ALREADY_BLOCKED, PAZPAR2_LAST_ERROR }; -struct host; -// Represents a (virtual) database on a host +// Represents a database struct database { - struct host *host; - char *url; - char **databases; - int errors; - struct zr_explain *explain; + char *id; int num_settings; struct setting **settings; struct database *next; @@ -79,7 +75,10 @@ struct session_database #define SESSION_WATCH_SHOW 0 #define SESSION_WATCH_RECORD 1 -#define SESSION_WATCH_MAX 1 +#define SESSION_WATCH_SHOW_PREF 2 +#define SESSION_WATCH_TERMLIST 3 +#define SESSION_WATCH_BYTARGET 4 +#define SESSION_WATCH_MAX 4 #define SESSION_MAX_TERMLISTS 10 @@ -97,26 +96,30 @@ struct session_watchentry { session_watchfun fun; }; +struct client_list; + // End-user session struct session { struct conf_service *service; /* service in use for this session */ struct session_database *databases; // All databases, settings overriden - struct client *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) - WRBUF wrbuf; // Wrbuf for scratch(i.e. search) int num_termlists; struct named_termlist termlists[SESSION_MAX_TERMLISTS]; struct relevance *relevance; struct reclist *reclist; struct session_watchentry watchlist[SESSION_WATCH_MAX + 1]; - Odr_int total_hits; int total_records; int total_merged; int number_of_warnings_unknown_elements; int number_of_warnings_unknown_metadata; normalize_cache_t normalize_cache; - YAZ_MUTEX mutex; + YAZ_MUTEX session_mutex; + unsigned session_id; + int settings_modified; + struct session_sorted_results *sorted_results; }; struct statistics { @@ -132,49 +135,72 @@ struct statistics { }; struct hitsbytarget { - char *id; + 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; - WRBUF settings_xml; + char *settings_xml; + char *suggestions_xml; }; -struct hitsbytarget *hitsbytarget(struct session *s, int *count, NMEM nmem); -struct session *new_session(NMEM nmem, struct conf_service *service); -void destroy_session(struct session *s); +struct hitsbytarget *get_hitsbytarget(struct session *s, int *count, NMEM nmem); +struct session *new_session(NMEM nmem, struct conf_service *service, + unsigned session_id); +void session_destroy(struct session *s); void session_init_databases(struct session *s); -int load_targets(struct session *s, const char *fn); void statistics(struct session *s, struct statistics *stat); -enum pazpar2_error_code search(struct session *s, const char *query, - const char *startrecs, const char *maxrecs, - const char *filter, const char **addinfo); + +void session_sort(struct session *se, const char *field, int increasing); + +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 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 **termlist(struct session *s, const char *name, int *num); +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); void session_apply_setting(struct session *se, char *dbname, char *setting, char *value); const char *session_setting_oneval(struct session_database *db, int offset); -int host_getaddrinfo(struct host *host, iochan_man_t iochan_man); - int ingest_record(struct client *cl, const char *rec, int record_no, NMEM nmem); void session_alert_watch(struct session *s, int what); -void pull_terms(NMEM nmem, struct ccl_rpn_node *n, char **termlist, int *num); +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, int version); +void session_log(struct session *s, int level, const char *fmt, ...) +#ifdef __GNUC__ + __attribute__ ((format (printf, 3, 4))) +#endif + ; #endif +struct session_sorted_results { + const char *field; + int increasing; + struct session_sorted_results *next; +}; + /* * Local variables: * c-basic-offset: 4