projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
[pazpar2-moved-to-github.git]
/
src
/
client.h
diff --git
a/src/client.h
b/src/client.h
index
70ba6d1
..
275b294
100644
(file)
--- a/
src/client.h
+++ b/
src/client.h
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* 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
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
#ifndef CLIENT_H
#define CLIENT_H
+#include "facet_limit.h"
+
struct client;
struct connection;
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);
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 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);
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);
int client_destroy(struct client *c);
void client_set_connection(struct client *cl, struct connection *con);
@@
-80,16
+83,16
@@
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_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);
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_remove_from_session(struct client *c);
void client_incref(struct client *c);
void client_got_records(struct client *c);
@@
-97,7
+100,12
@@
void client_lock(struct client *c);
void client_unlock(struct client *c);
int client_has_facet(struct client *cl, const char *name);
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
/*
#endif
/*