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

diff --git a/src/session.h b/src/session.h
index ec699ee..a815446 100644
--- a/src/session.h
+++ b/src/session.h
@@ -52,14 +52,9 @@ enum pazpar2_error_code {
     PAZPAR2_LAST_ERROR
 };
 
-struct host;
-// Represents a (virtual) database on a host
+// Represents a database
 struct database {
-    struct host *host;
-    char *url;
-    char **databases;
-    int errors;
-    struct zr_explain *explain;
+    char *id;
     int num_settings;
     struct setting **settings;
     struct database *next;
@@ -107,7 +102,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;
@@ -136,7 +130,7 @@ struct statistics {
 };
 
 struct hitsbytarget {
-    char *id;
+    const char *id;
     const char *name;
     Odr_int hits;
     int diagnostic;
@@ -146,13 +140,15 @@ 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);
 void session_init_databases(struct session *s);
-int load_targets(struct session *s, const char *fn);
 void statistics(struct session *s, struct statistics *stat);
+
+void search_sort(struct session *se, const char *field, int increasing);
+
 enum pazpar2_error_code search(struct session *s, const char *query,
                                const char *startrecs, const char *maxrecs,
                                const char *filter, const char *limit,
@@ -175,13 +171,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 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)))