/* This file is part of Pazpar2.
- Copyright (C) 2006-2010 Index Data
+ Copyright (C) 2006-2011 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
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;
#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
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 {
};
struct hitsbytarget {
- char *id;
+ const char *id;
const char *name;
Odr_int hits;
int diagnostic;
+ const char *addinfo;
int records;
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 hitsbytarget *get_hitsbytarget(struct session *s, int *count, NMEM nmem);
struct session *new_session(NMEM nmem, struct conf_service *service,
- const char *name);
-void destroy_session(struct session *s);
+ 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,
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);
+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