X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsession.h;h=17d805f0097f5527bbbd9d4127aed46946e67433;hb=b026a4535c9ce5e0d371f23f19f9a337963bc908;hp=7647e469f8e9e5b9fbb1c0cc25010ef86e8b47a7;hpb=d65081fd86127344075a112002adbfa32ff88f11;p=pazpar2-moved-to-github.git

diff --git a/src/session.h b/src/session.h
index 7647e46..17d805f 100644
--- a/src/session.h
+++ b/src/session.h
@@ -1,5 +1,5 @@
 /* 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
@@ -48,16 +48,14 @@ enum pazpar2_error_code {
     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;
-    int errors;
+    char *id;
     int num_settings;
     struct setting **settings;
     struct database *next;
@@ -78,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_MAX       2
+#define SESSION_WATCH_TERMLIST  3
+#define SESSION_WATCH_BYTARGET  4
+#define SESSION_WATCH_MAX       4
 
 #define SESSION_MAX_TERMLISTS 10
 
@@ -102,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 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;
@@ -110,7 +111,6 @@ struct session {
     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;
@@ -118,6 +118,8 @@ struct session {
     normalize_cache_t normalize_cache;
     YAZ_MUTEX session_mutex;
     unsigned session_id;
+    int settings_modified;
+    struct session_sorted_results *sorted_results;
 };
 
 struct statistics {
@@ -133,31 +135,40 @@ struct statistics {
 };
 
 struct hitsbytarget {
-    char *id;
+    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;
+    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);
-void destroy_session(struct session *s);
+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 *limit,
-                               const char **addinfo);
+
+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 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,
@@ -172,14 +183,12 @@ 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 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)))
@@ -187,6 +196,12 @@ void session_log(struct session *s, int level, const char *fmt, ...)
     ;
 #endif
 
+struct session_sorted_results {
+    const char *field;
+    int increasing;
+    struct session_sorted_results *next;
+};
+
 /*
  * Local variables:
  * c-basic-offset: 4