Happy new year

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

diff --git a/src/session.h b/src/session.h
index d51f5bb..a88cf8a 100644 (file)
--- a/src/session.h
+++ b/src/session.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2013 Index Data
+   Copyright (C) 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
@@ -26,9 +26,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/yaz-ccl.h>
 
 #include "facet_limit.h"
-#include "termlists.h"
+#include "relevance.h"
 #include "reclists.h"
-#include "http.h"
 
 struct record;
 struct client;
@@ -54,15 +53,6 @@ enum pazpar2_error_code {
     PAZPAR2_LAST_ERROR
 };
 
-// Represents a database
-struct database {
-    char *id;
-    int num_settings;
-    struct setting **settings;
-    struct database *next;
-};
-
-
 // Represents a database as viewed from one session, possibly with settings overriden
 // for that session
 struct session_database
@@ -81,14 +71,13 @@ struct session_database
 #define SESSION_WATCH_BYTARGET  4
 #define SESSION_WATCH_MAX       4
 
-#define SESSION_MAX_TERMLISTS 10
-
 typedef void (*session_watchfun)(void *data);
 
 struct named_termlist
 {
     char *name;
     struct termlist *termlist;
+    struct named_termlist *next;
 };
 
 struct session_watchentry {
@@ -107,8 +96,7 @@ struct session {
     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;
-    struct named_termlist termlists[SESSION_MAX_TERMLISTS];
+    struct named_termlist *termlists;
     struct relevance *relevance;
     struct reclist *reclist;
     char *mergekey;
@@ -123,7 +111,10 @@ struct session {
     unsigned session_id;
     int settings_modified;
     facet_limits_t facet_limits;
+    int clients_starting;
+    int force_position;
     struct reclist_sortparms *sorted_results;
+    struct facet_id *facet_id_list;
 };
 
 struct statistics {
@@ -152,15 +143,19 @@ struct hitsbytarget {
     int connected;
     char *settings_xml;
     char *suggestions_xml;
+    const char *query_type;
+    const char *query_data;
 };
 
 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 session *session_create(NMEM nmem, struct conf_service *service,
+                               unsigned session_id);
 void session_destroy(struct session *s);
 void session_init_databases(struct session *s);
 void statistics(struct session *s, struct statistics *stat);
 
+int sessions_get_count(void);
+
 void session_sort(struct session *se, struct reclist_sortparms *sp,
                   const char *mergekey, const char *rank);
 
@@ -169,6 +164,7 @@ enum pazpar2_error_code session_search(struct session *s, const char *query,
                                        const char *maxrecs,
                                        const char *filter, const char *limit,
                                        const char **addinfo,
+                                       const char **addinfo2,
                                        struct reclist_sortparms *sort_parm,
                                        const char *mergekey,
                                        const char *rank);
@@ -190,16 +186,24 @@ void show_single_stop(struct session *s, struct record_cluster *rec);
 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);
+void session_apply_setting(struct session *se, const char *dbname,
+                           const char *setting, const char *value);
 const char *session_setting_oneval(struct session_database *db, int offset);
+void session_stop(struct session *se);
 
 int ingest_record(struct client *cl, const char *rec, int record_no, NMEM nmem);
+int ingest_xml_record(struct client *cl, xmlDoc *xdoc,
+                      int record_no, NMEM nmem, int cached_copy);
 void session_alert_watch(struct session *s, int what);
-void add_facet(struct session *s, const char *type, const char *value, int count);
+void add_facet(struct session *s, const char *type, const char *value, int count, struct client *cl);
 
 int session_check_cluster_limit(struct session *se, struct record_cluster *rec);
 
 void perform_termlist(struct http_channel *c, struct session *se, const char *name, int num, int version);
+
+const char *session_lookup_id_facet(struct session *s, struct client *cl,
+                                    const char *type, const char *term);
+
 void session_log(struct session *s, int level, const char *fmt, ...)
 #ifdef __GNUC__
     __attribute__ ((format (printf, 3, 4)))