/* 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
#define SESSION_WATCH_SHOW 0
#define SESSION_WATCH_RECORD 1
#define SESSION_WATCH_SHOW_PREF 2
-#define SESSION_WATCH_BYTARGET 3
-#define SESSION_WATCH_MAX 3
+#define SESSION_WATCH_TERMLIST 3
+#define SESSION_WATCH_BYTARGET 4
+#define SESSION_WATCH_MAX 4
#define SESSION_MAX_TERMLISTS 10
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;
normalize_cache_t normalize_cache;
YAZ_MUTEX session_mutex;
unsigned session_id;
+ int settings_modified;
struct session_sorted_results *sorted_results;
};
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;
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 destroy_session(struct session *s);
+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,
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);
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)))
;
#endif
+struct session_sorted_results {
+ const char *field;
+ int increasing;
+ int position;
+ struct session_sorted_results *next;
+};
+
/*
* Local variables:
* c-basic-offset: 4