X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fsession.c;h=21a47294f11bd0133a8d3598ac830b9406dca1b3;hb=873be84689528ca10a1ded3dd4bbda24b6916882;hp=388e94ef02cfdd2022dc915acbad114e2604980e;hpb=1e8adcca70828544df65770652d86e7d828a5795;p=pazpar2-moved-to-github.git diff --git a/src/session.c b/src/session.c index 388e94e..21a4729 100644 --- a/src/session.c +++ b/src/session.c @@ -438,7 +438,7 @@ static int prepare_map(struct session *se, struct session_database *sdb) } } sdb->map = normalize_cache_get(se->normalize_cache, - se->service->server->config, s); + se->service, s); if (!sdb->map) return -1; } @@ -869,12 +869,6 @@ void session_destroy(struct session *se) { yaz_mutex_destroy(&se->session_mutex); } -/* Depreciated: use session_destroy */ -void destroy_session(struct session *se) -{ - session_destroy(se); -} - size_t session_get_memory_status(struct session *session) { size_t session_nmem; if (session == 0) @@ -921,6 +915,8 @@ struct session *new_session(NMEM nmem, struct conf_service *service, return session; } +const char * client_get_suggestions_xml(struct client *cl, WRBUF wrbuf); + static struct hitsbytarget *hitsbytarget_nb(struct session *se, int *count, NMEM nmem) { @@ -949,6 +945,9 @@ static struct hitsbytarget *hitsbytarget_nb(struct session *se, res[*count].connected = client_get_connection(cl) ? 1 : 0; session_settings_dump(se, client_get_database(cl), w); res[*count].settings_xml = nmem_strdup(nmem, wrbuf_cstr(w)); + wrbuf_rewind(w); + wrbuf_puts(w, ""); + res[*count].suggestions_xml = nmem_strdup(nmem, client_get_suggestions_xml(cl, w)); wrbuf_destroy(w); (*count)++; }