Allow merge on merged content

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

diff --git a/src/client.h b/src/client.h
index 7a840b1..422a380 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -18,13 +18,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 /** \file client.h
-    \brief Z39.50 client 
+    \brief Z39.50 client
 */
 
 #ifndef CLIENT_H
 #define CLIENT_H
 
 #include "facet_limit.h"
+#include "reclists.h"
 
 struct client;
 struct connection;
@@ -77,22 +78,26 @@ void client_disconnect(struct client *cl);
 int client_prep_connection(struct client *cl,
                            int operation_timeout, int session_timeout,
                            iochan_man_t iochan,
-                           const struct timeval *abstime,
-                           int ok_with_working);
-void client_start_search(struct client *cl);
+                           const struct timeval *abstime);
+int client_start_search(struct client *cl);
+int client_parse_init(struct client *cl, int same_search);
+int client_parse_range(struct client *cl, const char *startrecs, const char *maxrecs);
+int client_parse_sort(struct client *cl, struct reclist_sortparms *sp);
 void client_set_session(struct client *cl, struct session *se);
 int client_is_active(struct client *cl);
 int client_is_active_preferred(struct client *cl);
 struct client *client_next_in_session(struct client *cl);
 
 int client_parse_query(struct client *cl, const char *query,
-                       facet_limits_t facet_limits, const char *startrecs,
-                       const char *maxrecs);
+                       facet_limits_t facet_limits);
 Odr_int client_get_hits(struct client *cl);
+Odr_int client_get_approximation(struct client *cl);
 int client_get_num_records(struct client *cl);
-int client_get_diagnostic(struct client *cl, const char **addinfo);
+int client_get_num_records_filtered(struct client *cl);
+int client_get_diagnostic(struct client *cl,
+                          const char **message, const char **addinfo);
 void client_set_diagnostic(struct client *cl, int diagnostic,
-                           const char *addinfo);
+                           const char *message, const char *addinfo);
 void client_set_database(struct client *cl, struct session_database *db);
 const char *client_get_id(struct client *cl);
 int  client_get_maxrecs(struct client *cl);
@@ -104,11 +109,14 @@ void client_unlock(struct client *c);
 
 int client_has_facet(struct client *cl, const char *name);
 void client_check_preferred_watch(struct client *cl);
-void client_reingest(struct client *cl);
+int client_reingest(struct client *cl);
 const char *client_get_facet_limit_local(struct client *cl,
                                          struct session_database *sdb,
                                          int *l,
                                          NMEM nmem, int *num, char ***values);
+
+int client_test_sort_order(struct client *cl, struct reclist_sortparms *sp);
+
 #endif
 
 /*