X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.h;h=cb9d3ee8ae70bf825c5ac03416f944b269d197d7;hb=817e3ec506c4095bc4fcc1923cee36153ef4ee43;hp=fcb4c9cc5b73fc322d318491352a709e96c5c565;hpb=58aba67e02b51934a2cae721269fb381d8b0b08b;p=pazpar2-moved-to-github.git

diff --git a/src/client.h b/src/client.h
index fcb4c9c..cb9d3ee 100644
--- a/src/client.h
+++ b/src/client.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2011 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
@@ -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;
@@ -39,35 +40,31 @@ enum client_state
     Client_Disconnected
 };
 
+int clients_count(void);
 int client_show_raw_begin(struct client *cl, int position,
                           const char *syntax, const char *esn,
                           void *data,
                           void (*error_handler)(void *data, const char *addinfo),
                           void (*record_handler)(void *data, const char *buf,
                                                  size_t sz),
-                          int binary);
+                          int binary,
+                          const char *nativesyntax);
 
 void client_show_raw_remove(struct client *cl, void *rr);
 
 const char *client_get_state_str(struct client *cl);
 enum client_state client_get_state(struct client *cl);
 void client_set_state(struct client *cl, enum client_state st);
+void client_set_state_nb(struct client *cl, enum client_state st);
 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);
+void client_record_response(struct client *cl, int *got_records);
 
-int client_is_our_response(struct client *cl);
-
-void client_continue(struct client *cl);
-
-struct client *client_create(void);
+struct client *client_create(const char *url);
 int client_destroy(struct client *c);
 
 void client_set_connection(struct client *cl, struct connection *con);
@@ -76,24 +73,29 @@ 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);
 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);
+                       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_diagnostic(struct client *cl);
-void client_set_diagnostic(struct client *cl, int diagnostic);
+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 *message, const char *addinfo);
 void client_set_database(struct client *cl, struct session_database *db);
-struct host *client_get_host(struct client *cl);
-const char *client_get_url(struct client *cl);
-void client_set_maxrecs(struct client *cl, int v);
+const char *client_get_id(struct client *cl);
 int  client_get_maxrecs(struct client *cl);
-void client_set_startrecs(struct client *cl, int v);
 void client_remove_from_session(struct client *c);
 void client_incref(struct client *c);
 void client_got_records(struct client *c);
@@ -102,6 +104,13 @@ void client_unlock(struct client *c);
 
 int client_has_facet(struct client *cl, const char *name);
 void client_check_preferred_watch(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);
+
+void client_update_show_stat(struct client *cl, int cmd);
 
 #endif