X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsession.h;h=7647e469f8e9e5b9fbb1c0cc25010ef86e8b47a7;hb=35433bc832cb3fbe7cca5f0e64f0d7d0d87914e1;hp=ec699ee00b1e2227fb3e6564120ba353af472cc4;hpb=58aba67e02b51934a2cae721269fb381d8b0b08b;p=pazpar2-moved-to-github.git

diff --git a/src/session.h b/src/session.h
index ec699ee..7647e46 100644
--- a/src/session.h
+++ b/src/session.h
@@ -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;
@@ -107,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;
@@ -146,7 +143,7 @@ struct hitsbytarget {
     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,
                             unsigned session_id);
 void destroy_session(struct session *s);
@@ -179,9 +176,10 @@ 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)))