projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New limit/limitmap test
[pazpar2-moved-to-github.git]
/
src
/
session.h
diff --git
a/src/session.h
b/src/session.h
index
38e3a38
..
886f1b6
100644
(file)
--- a/
src/session.h
+++ b/
src/session.h
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* 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
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,6
+48,7
@@
enum pazpar2_error_code {
PAZPAR2_RECORD_FAIL,
PAZPAR2_NOT_IMPLEMENTED,
PAZPAR2_NO_SERVICE,
PAZPAR2_RECORD_FAIL,
PAZPAR2_NOT_IMPLEMENTED,
PAZPAR2_NO_SERVICE,
+ PAZPAR2_ALREADY_BLOCKED,
PAZPAR2_LAST_ERROR
};
PAZPAR2_LAST_ERROR
};
@@
-75,7
+76,9
@@
struct session_database
#define SESSION_WATCH_SHOW 0
#define SESSION_WATCH_RECORD 1
#define SESSION_WATCH_SHOW_PREF 2
#define SESSION_WATCH_SHOW 0
#define SESSION_WATCH_RECORD 1
#define SESSION_WATCH_SHOW_PREF 2
-#define SESSION_WATCH_MAX 2
+#define SESSION_WATCH_TERMLIST 3
+#define SESSION_WATCH_BYTARGET 4
+#define SESSION_WATCH_MAX 4
#define SESSION_MAX_TERMLISTS 10
#define SESSION_MAX_TERMLISTS 10
@@
-99,7
+102,8
@@
struct client_list;
struct session {
struct conf_service *service; /* service in use for this session */
struct session_database *databases; // All databases, settings overriden
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;
NMEM session_nmem; // Nmem for session-permanent storage
NMEM nmem; // Nmem for each operation (i.e. search, result set, etc)
int num_termlists;
@@
-114,6
+118,7
@@
struct session {
normalize_cache_t normalize_cache;
YAZ_MUTEX session_mutex;
unsigned session_id;
normalize_cache_t normalize_cache;
YAZ_MUTEX session_mutex;
unsigned session_id;
+ int settings_modified;
struct session_sorted_results *sorted_results;
};
struct session_sorted_results *sorted_results;
};
@@
-133,17
+138,21
@@
struct hitsbytarget {
const char *id;
const char *name;
Odr_int hits;
const char *id;
const char *name;
Odr_int hits;
+ Odr_int approximation;
int diagnostic;
int diagnostic;
+ const char *addinfo;
int records;
int records;
+ int filtered;
const char *state;
int connected;
char *settings_xml;
const char *state;
int connected;
char *settings_xml;
+ char *suggestions_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);
};
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_init_databases(struct session *s);
void statistics(struct session *s, struct statistics *stat);
@@
-158,7
+167,7
@@
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,
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,
void show_range_stop(struct session *s, struct record_cluster **recs);
struct record_cluster *show_single_start(struct session *s, const char *id,
@@
-177,8
+186,8
@@
int ingest_record(struct client *cl, const char *rec, int record_no, NMEM nmem);
void session_alert_watch(struct session *s, int what);
void add_facet(struct session *s, const char *type, const char *value, int count);
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)))
void session_log(struct session *s, int level, const char *fmt, ...)
#ifdef __GNUC__
__attribute__ ((format (printf, 3, 4)))
@@
-186,6
+195,12
@@
void session_log(struct session *s, int level, const char *fmt, ...)
;
#endif
;
#endif
+struct session_sorted_results {
+ const char *field;
+ int increasing;
+ struct session_sorted_results *next;
+};
+
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4