X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.h;h=7971408796df4f830543df872ca7cbfa92396ea9;hb=9d1f467a2e9c2b8d9b85822c538fc6474c0aa46e;hp=2fb8adacea167c9d92385f64be8e6c69a524bb35;hpb=e07a5d5dfcf5be4cc9eb3ab91a60866ff0aee09c;p=pazpar2-moved-to-github.git

diff --git a/src/client.h b/src/client.h
index 2fb8ada..7971408 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) 2006-2012 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
@@ -45,13 +45,15 @@ int client_show_raw_begin(struct client *cl, int position,
                           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);
@@ -76,24 +78,23 @@ 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, const char *sort_strategy_and_spec,
-                         int increasing);
+void client_start_search(struct client *cl);
 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 *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);
+int client_get_diagnostic(struct client *cl, const char **addinfo);
+void client_set_diagnostic(struct client *cl, int diagnostic,
+                           const char *addinfo);
 void client_set_database(struct client *cl, struct session_database *db);
 const char *client_get_id(struct client *cl);
-void client_set_maxrecs(struct client *cl, int v);
 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,7 +103,11 @@ 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);
+const char *client_get_facet_limit_local(struct client *cl,
+                                         struct session_database *sdb,
+                                         int *l,
+                                         NMEM nmem, int *num, char ***values);
 #endif
 
 /*