X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.h;h=97e8b6800f66930e2cda5a9a15481040cdb0b988;hb=158c725b0201be796e73338f8c8b529379912ad6;hp=4d23481a51a2825998490a9b302bf32cf7625c47;hpb=ce617dd90a2dc6632e7475ab73a887e0fb472c5c;p=pazpar2-moved-to-github.git

diff --git a/src/client.h b/src/client.h
index 4d23481..97e8b68 100644
--- a/src/client.h
+++ b/src/client.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2010 Index Data
+   Copyright (C) 2006-2011 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
@@ -24,6 +24,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef CLIENT_H
 #define CLIENT_H
 
+#include "facet_limit.h"
+
 struct client;
 struct connection;
 
@@ -50,6 +52,7 @@ 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);
@@ -65,7 +68,7 @@ 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);
@@ -73,27 +76,35 @@ 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 timespec *abstime);
-void client_start_search(struct client *cl);
+                           const struct timeval *abstime);
+void client_start_search(struct client *cl, const char *sort_strategy_and_spec,
+                         int increasing);
 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);
+int client_parse_query(struct client *cl, const char *query,
+                       facet_limits_t facet_limits, const char *startrecs,
+                       const char *maxrecs);
 Odr_int client_get_hits(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);
 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);
-void client_set_startrecs(struct client *cl, int v);
+const char *client_get_id(struct client *cl);
+int  client_get_maxrecs(struct client *cl);
 void client_remove_from_session(struct client *c);
 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);
+
+int client_has_facet(struct client *cl, const char *name);
+void client_check_preferred_watch(struct client *cl);
+void client_reingest(struct client *cl);
+
+
 #endif
 
 /*