X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.h;h=182b72f9df4d5eec78cb79c4998e04cfe999a2e6;hb=ff21539a6f1462d715335d51adcf6e8be94f1b71;hp=300caa7a1ac970229574379740ae548966ebf1c1;hpb=8961ed761e348e972f00d015284ce75c16b1648c;p=pazpar2-moved-to-github.git

diff --git a/src/client.h b/src/client.h
index 300caa7..182b72f 100644
--- a/src/client.h
+++ b/src/client.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 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
@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define CLIENT_H
 
 #include "facet_limit.h"
+#include "reclists.h"
 
 struct client;
 struct connection;
@@ -39,6 +40,7 @@ enum client_state
     Client_Disconnected
 };
 
+int clients_get_count(void);
 int client_show_raw_begin(struct client *cl, int position,
                           const char *syntax, const char *esn,
                           void *data,
@@ -58,43 +60,41 @@ struct connection *client_get_connection(struct client *cl);
 struct session_database *client_get_database(struct client *cl);
 void client_set_database(struct client *cl, struct session_database *db);
 struct session *client_get_session(struct client *cl);
-const char *client_get_pquery(struct client *cl);
 
-void client_init_response(struct client *cl, Z_APDU *a);
 void client_search_response(struct client *cl);
-void client_record_response(struct client *cl);
-void client_close_response(struct client *cl, Z_APDU *a);
-
-int client_is_our_response(struct client *cl);
-
-void client_continue(struct client *cl);
+void client_record_response(struct client *cl, int *got_records);
 
 struct client *client_create(const char *url);
 int client_destroy(struct client *c);
 
 void client_set_connection(struct client *cl, struct connection *con);
 void client_disconnect(struct client *cl);
+void client_mark_dead(struct client *cl);
 int client_prep_connection(struct client *cl,
                            int operation_timeout, int session_timeout,
                            iochan_man_t iochan,
                            const struct timeval *abstime);
-void client_start_search(struct client *cl);
+int client_start_search(struct client *cl);
+int client_fetch_more(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,
+                      int *has_sortmap);
 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,
-                       CCL_bibset bibset);
+                       facet_limits_t facet_limits, const char **error_msg);
 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_num_records_filtered(struct client *cl);
-int client_get_diagnostic(struct client *cl, const char **addinfo);
+int client_get_num_records(struct client *cl, int *filtered, int *ingest,
+                           int *failed);
+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);
@@ -103,14 +103,23 @@ void client_incref(struct client *c);
 void client_got_records(struct client *c);
 void client_lock(struct client *c);
 void client_unlock(struct client *c);
+void client_stop(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);
+
+const char *client_get_suggestions_xml(struct client *cl, WRBUF wrbuf);
+
+void client_update_show_stat(struct client *cl, int cmd);
+
+void client_store_xdoc(struct client *cl, int record_no, xmlDoc *xdoc);
+
+const char *client_get_query(struct client *cl, const char **type, NMEM nmem);
+
 #endif
 
 /*