Merge branch 'master' into bug_4688

[pazpar2-moved-to-github.git] / src / session.h

diff --git a/src/session.h b/src/session.h
index 13bc314..70b5f74 100644 (file)
--- a/src/session.h
+++ b/src/session.h
@@ -100,6 +100,7 @@ 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_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;
@@ -114,6 +115,7 @@ struct session {
     normalize_cache_t normalize_cache;
     YAZ_MUTEX session_mutex;
     unsigned session_id;
+    int settings_modified;
     struct session_sorted_results *sorted_results;
 };
 
@@ -144,7 +146,7 @@ struct hitsbytarget {
 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);