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

diff --git a/src/client.h b/src/client.h
index 97e8b68..e5861b3 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,7 +45,8 @@ 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);
 
@@ -77,8 +78,7 @@ 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);
@@ -86,11 +86,15 @@ 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);
+                       const char *maxrecs,
+                       CCL_bibset bibset);
 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 **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);
 int  client_get_maxrecs(struct client *cl);
@@ -103,8 +107,10 @@ 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
 
 /*