Simplify ZURL resolving and use regular getaddrinfo

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

diff --git a/src/session.h b/src/session.h
index d7f3efb..7647e46 100644 (file)
--- a/src/session.h
+++ b/src/session.h
@@ -1,5 +1,5 @@
 /* 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
@@ -57,9 +57,7 @@ struct host;
 struct database {
     struct host *host;
     char *url;
-    char **databases;
     int errors;
-    struct zr_explain *explain;
     int num_settings;
     struct setting **settings;
     struct database *next;
@@ -79,7 +77,8 @@ struct session_database
 
 #define SESSION_WATCH_SHOW      0
 #define SESSION_WATCH_RECORD    1
-#define SESSION_WATCH_MAX       1
+#define SESSION_WATCH_SHOW_PREF 2
+#define SESSION_WATCH_MAX       2
 
 #define SESSION_MAX_TERMLISTS 10
 
@@ -106,7 +105,6 @@ struct session {
     struct client_list *clients;   // Clients connected for current search
     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;
@@ -119,6 +117,7 @@ struct session {
     int number_of_warnings_unknown_metadata;
     normalize_cache_t normalize_cache;
     YAZ_MUTEX session_mutex;
+    unsigned session_id;
 };
 
 struct statistics {
@@ -141,19 +140,20 @@ struct hitsbytarget {
     int records;
     const char *state;
     int connected;
-    WRBUF settings_xml;
+    char *settings_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);
+                            unsigned session_id);
 void destroy_session(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);
+                               const char *filter, const char *limit,
+                               const char **addinfo);
 struct record_cluster **show_range_start(struct session *s,
                                          struct reclist_sortparms *sp,
                                          int start,
@@ -164,9 +164,11 @@ struct record_cluster *show_single_start(struct session *s, const char *id,
                                          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);
 
@@ -174,10 +176,15 @@ 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
 
 /*