-char *search(struct session *s, char *query);
-struct record **show(struct session *s, int start, int *num, int *total, int *sumhits, NMEM nmem_show);
-struct termlist_score **termlist(struct session *s, int *num);
-void session_set_watch(struct session *s, int what, session_watchfun fun, void *data);
+enum pazpar2_error_code search(struct session *s, const char *query,
+ const char *filter, const char **addinfo);
+struct record_cluster **show(struct session *s, struct reclist_sortparms *sp, int start,
+ int *num, int *total, int *sumhits, NMEM nmem_show);
+struct record_cluster *show_single(struct session *s, const char *id,
+ struct record_cluster **prev_r,
+ struct record_cluster **next_r);
+struct termlist_score **termlist(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);
+void session_apply_setting(struct session *se, char *dbname, char *setting, char *value);
+const char *session_setting_oneval(struct session_database *db, int offset);
+
+void pazpar2_add_channel(IOCHAN c);
+void pazpar2_event_loop(void);
+
+int host_getaddrinfo(struct host *host);
+
+struct record *ingest_record(struct client *cl, const char *rec,
+ int record_no);
+void session_alert_watch(struct session *s, int what);
+void pull_terms(NMEM nmem, struct ccl_rpn_node *n, char **termlist, int *num);