X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fsession.h;h=2c943d9ade1e92d51a521f7816f2e0f7742d9c1f;hb=4f6b54c65f9ac5b0760bc11eb51747857c1d5589;hp=bb4dec4e397a86fcd6e91a3133aed810b321152e;hpb=0e0ddf5be474a96ae8838fe9845858b7ca96b9d8;p=pazpar2-moved-to-github.git diff --git a/src/session.h b/src/session.h index bb4dec4..2c943d9 100644 --- a/src/session.h +++ b/src/session.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 @@ -107,7 +107,6 @@ struct session { struct client_list *clients; // Clients connected for current search NMEM session_nmem; // Nmem for session-permanent storage NMEM nmem; // Nmem for each operation (i.e. search, result set, etc) - WRBUF wrbuf; // Wrbuf for scratch(i.e. search) int num_termlists; struct named_termlist termlists[SESSION_MAX_TERMLISTS]; struct relevance *relevance; @@ -143,7 +142,7 @@ struct hitsbytarget { int records; const char *state; int connected; - WRBUF settings_xml; + char *settings_xml; }; struct hitsbytarget *hitsbytarget(struct session *s, int *count, NMEM nmem); @@ -155,7 +154,8 @@ int load_targets(struct session *s, const char *fn); void statistics(struct session *s, struct statistics *stat); enum pazpar2_error_code search(struct session *s, const char *query, const char *startrecs, const char *maxrecs, - const char *filter, const char **addinfo); + const char *filter, const char *limit, + const char **addinfo); struct record_cluster **show_range_start(struct session *s, struct reclist_sortparms *sp, int start, @@ -166,7 +166,8 @@ struct record_cluster *show_single_start(struct session *s, const char *id, struct record_cluster **prev_r, struct record_cluster **next_r); void show_single_stop(struct session *s, struct record_cluster *rec); -struct termlist_score **termlist(struct session *s, const char *name, int *num); +struct termlist_score **get_termlist_score(struct session *s, + const char *name, int *num); int session_set_watch(struct session *s, int what, session_watchfun fun, void *data, struct http_channel *c); int session_active_clients(struct session *s); int session_is_preferred_clients_ready(struct session *s);