X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=dcb21a7765275614fc423304c2fe2f51bf5fa5fe;hb=HEAD;hp=0cc172ba09fab39f7a9a3bdc9927d4cdf8321a38;hpb=49088b6680bed3c069be10ff0cb7cc16f3733729;p=pazpar2-moved-to-github.git diff --git a/src/http_command.c b/src/http_command.c index 0cc172b..dcb21a7 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2008 Index Data + Copyright (C) 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 @@ -33,27 +33,130 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include -#include "util.h" +#include "ppmutex.h" #include "eventl.h" -#include "pazpar2.h" +#include "parameters.h" +#include "session.h" #include "http.h" -#include "http_command.h" #include "settings.h" #include "client.h" +#ifdef HAVE_MALLINFO +#include + +void print_meminfo(WRBUF wrbuf) +{ + struct mallinfo minfo; + minfo = mallinfo(); + wrbuf_printf(wrbuf, " \n" + " %d\n" + " %d\n" + " %d\n" + " %d\n" + " %d\n" + " %d\n" + " %d\n" + " %d\n" + " %d\n" + " %d\n" + " \n", + minfo.arena, + minfo.ordblks, + minfo.smblks, + minfo.hblks, + minfo.hblkhd, + minfo.usmblks, + minfo.fsmblks, + minfo.uordblks, + minfo.fordblks, + minfo.keepcost); +} +#else +#define print_meminfo(x) +#endif + + // Update this when the protocol changes #define PAZPAR2_PROTOCOL_VERSION "1" +#define HTTP_COMMAND_RESPONSE_PREFIX "\n" + struct http_session { IOCHAN timeout_iochan; // NOTE: This is NOT associated with a socket struct session *psession; unsigned int session_id; int timestamp; + int destroy_counter; + int activity_counter; NMEM nmem; + http_sessions_t http_sessions; struct http_session *next; }; -static struct http_session *session_list = 0; +struct http_sessions { + struct http_session *session_list; + YAZ_MUTEX mutex; + int log_level; +}; + +static YAZ_MUTEX g_http_session_mutex = 0; +static int g_http_sessions = 0; + +static void show_records_ready(void *data); + +int get_version(struct http_request *rq) { + const char *version = http_argbyname(rq, "version"); + int version_no = 0; + if (version && strcmp(version, "")) { + version_no = atoi(version); + } + return version_no; +} + + +int http_session_use(int delta) +{ + int sessions; + if (!g_http_session_mutex) + yaz_mutex_create(&g_http_session_mutex); + yaz_mutex_enter(g_http_session_mutex); + g_http_sessions += delta; + sessions = g_http_sessions; + yaz_mutex_leave(g_http_session_mutex); + yaz_log(YLOG_DEBUG, "%s http_sessions=%d", delta == 0 ? "" : + (delta > 0 ? "INC" : "DEC"), sessions); + return sessions; + +} + +http_sessions_t http_sessions_create(void) +{ + http_sessions_t hs = xmalloc(sizeof(*hs)); + hs->session_list = 0; + hs->mutex = 0; + pazpar2_mutex_create(&hs->mutex, "http_sessions"); + hs->log_level = yaz_log_module_level("http"); + return hs; +} + +void http_sessions_destroy(http_sessions_t hs) +{ + if (hs) + { + struct http_session *s = hs->session_list; + while (s) + { + struct http_session *s_next = s->next; + iochan_destroy(s->timeout_iochan); + session_destroy(s->psession); + nmem_destroy(s->nmem); + s = s_next; + } + yaz_mutex_destroy(&hs->mutex); + xfree(hs); + } +} + void http_session_destroy(struct http_session *s); static void session_timeout(IOCHAN i, int event) @@ -62,39 +165,78 @@ static void session_timeout(IOCHAN i, int event) http_session_destroy(s); } -struct http_session *http_session_create() +struct http_session *http_session_create(struct conf_service *service, + http_sessions_t http_sessions, + unsigned int sesid) { NMEM nmem = nmem_create(); struct http_session *r = nmem_malloc(nmem, sizeof(*r)); + char tmp_str[50]; - r->psession = new_session(nmem); - r->session_id = 0; + sprintf(tmp_str, "session#%u", sesid); + r->psession = session_create(nmem, service, sesid); + r->session_id = sesid; r->timestamp = 0; r->nmem = nmem; - r->next = session_list; - session_list = r; - r->timeout_iochan = iochan_create(-1, session_timeout, 0); + r->destroy_counter = r->activity_counter = 0; + r->http_sessions = http_sessions; + + yaz_mutex_enter(http_sessions->mutex); + r->next = http_sessions->session_list; + http_sessions->session_list = r; + yaz_mutex_leave(http_sessions->mutex); + + r->timeout_iochan = iochan_create(-1, session_timeout, 0, + "http_session_timeout"); iochan_setdata(r->timeout_iochan, r); - iochan_settimeout(r->timeout_iochan, global_parameters.session_timeout); - pazpar2_add_channel(r->timeout_iochan); + session_log(r->psession, http_sessions->log_level, + "HTTP session create. timeout chan=%p ses=%d", + r->timeout_iochan, service->session_timeout); + iochan_settimeout(r->timeout_iochan, service->session_timeout); + + iochan_add(service->server->iochan_man, r->timeout_iochan, -1); + http_session_use(1); return r; } void http_session_destroy(struct http_session *s) { - struct http_session **p; + int must_destroy = 0; + + http_sessions_t http_sessions = s->http_sessions; + + session_log(s->psession, http_sessions->log_level, + "HTTP session destroy"); + yaz_mutex_enter(http_sessions->mutex); + /* only if http_session has no active http sessions on it can be destroyed */ + if (s->destroy_counter == s->activity_counter) + { + struct http_session **p = 0; + must_destroy = 1; + for (p = &http_sessions->session_list; *p; p = &(*p)->next) + if (*p == s) + { + *p = (*p)->next; + break; + } + } + yaz_mutex_leave(http_sessions->mutex); + if (must_destroy) + { /* destroying for real */ + session_log(s->psession, http_sessions->log_level, "About to destroyd"); + iochan_destroy(s->timeout_iochan); + session_destroy(s->psession); + http_session_use(-1); + nmem_destroy(s->nmem); + } + else + { + session_log(s->psession, http_sessions->log_level, + "Destroy delayed. Active clients (%d-%d)", + s->activity_counter, s->destroy_counter); + } - for (p = &session_list; *p; p = &(*p)->next) - if (*p == s) - { - *p = (*p)->next; - break; - } - yaz_log(YLOG_LOG, "Destroying session %u", s->session_id); - iochan_destroy(s->timeout_iochan); - destroy_session(s->psession); - nmem_destroy(s->nmem); } static const char *get_msg(enum pazpar2_error_code code) @@ -115,6 +257,8 @@ static const char *get_msg(enum pazpar2_error_code code) { PAZPAR2_CONFIG_TARGET, "Target cannot be configured"}, { PAZPAR2_RECORD_FAIL, "Record command failed"}, { PAZPAR2_NOT_IMPLEMENTED, "Not implemented"}, + { PAZPAR2_NO_SERVICE, "No service"}, + { PAZPAR2_ALREADY_BLOCKED, "Already blocked in session on: "}, { PAZPAR2_LAST_ERROR, "Last error"}, { 0, 0 } }; @@ -128,22 +272,29 @@ static const char *get_msg(enum pazpar2_error_code code) return "No error"; } -static void error(struct http_response *rs, - enum pazpar2_error_code code, - const char *addinfo) +static void error2(struct http_response *rs, + enum pazpar2_error_code code, + const char *addinfo, const char *addinfo2) { struct http_channel *c = rs->channel; WRBUF text = wrbuf_alloc(); const char *http_status = "417"; const char *msg = get_msg(code); - + rs->msg = nmem_strdup(c->nmem, msg); strcpy(rs->code, http_status); - wrbuf_printf(text, "", (int) code, - msg); + wrbuf_printf(text, HTTP_COMMAND_RESPONSE_PREFIX + "", (int) code, msg); if (addinfo) + { wrbuf_xmlputs(text, addinfo); + if (addinfo2) + { + wrbuf_xmlputs(text, ": "); + wrbuf_xmlputs(text, addinfo2); + } + } wrbuf_puts(text, ""); yaz_log(YLOG_WARN, "HTTP %s %s%s%s", http_status, @@ -153,13 +304,44 @@ static void error(struct http_response *rs, http_send_response(c); } -unsigned int make_sessionid() +static void error(struct http_response *rs, + enum pazpar2_error_code code, + const char *addinfo) +{ + error2(rs, code, addinfo, 0); +} + +static void response_open_command(struct http_channel *c, const char *command) +{ + wrbuf_rewind(c->wrbuf); + wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX); + if (command) + wrbuf_printf(c->wrbuf, "<%s>", command); +} + +static void response_open_ok(struct http_channel *c, const char *command) +{ + response_open_command(c, command); + wrbuf_puts(c->wrbuf, "OK"); +} + +static void response_close(struct http_channel *c, const char *command) +{ + struct http_response *rs = c->response; + + if (command) + wrbuf_printf(c->wrbuf, "", command); + rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); + http_send_response(c); +} + +unsigned int make_sessionid(void) { - static int seq = 0; + static int seq = 0; /* thread pr */ unsigned int res; seq++; - if (global_parameters.debug_mode) + if (global_parameters.predictable_sessions) res = seq; else { @@ -173,7 +355,7 @@ unsigned int make_sessionid() yaz_log(YLOG_WARN|YLOG_ERRNO, "gettimeofday"); exit(1); } - /* at most 256 sessions per second .. + /* at most 256 sessions per second .. (long long would be more appropriate)*/ res = t.tv_sec; res = ((res << 8) | (seq & 0xff)) & ((1U << 31) - 1); @@ -182,10 +364,13 @@ unsigned int make_sessionid() return res; } -static struct http_session *locate_session(struct http_request *rq, struct http_response *rs) +static struct http_session *locate_session(struct http_channel *c) { + struct http_request *rq = c->request; + struct http_response *rs = c->response; struct http_session *p; - char *session = http_argbyname(rq, "session"); + const char *session = http_argbyname(rq, "session"); + http_sessions_t http_sessions = c->http_sessions; unsigned int id; if (!session) @@ -194,22 +379,38 @@ static struct http_session *locate_session(struct http_request *rq, struct http_ return 0; } id = atoi(session); - for (p = session_list; p; p = p->next) + yaz_mutex_enter(http_sessions->mutex); + for (p = http_sessions->session_list; p; p = p->next) if (id == p->session_id) - { - iochan_activity(p->timeout_iochan); - return p; - } - error(rs, PAZPAR2_NO_SESSION, session); - return 0; + break; + if (p) + p->activity_counter++; + yaz_mutex_leave(http_sessions->mutex); + if (p) + iochan_activity(p->timeout_iochan); + else + error(rs, PAZPAR2_NO_SESSION, session); + return p; +} + +// Call after use of locate_session, in order to increment the destroy_counter +static void release_session(struct http_channel *c, + struct http_session *session) +{ + http_sessions_t http_sessions = c->http_sessions; + yaz_mutex_enter(http_sessions->mutex); + if (session) + session->destroy_counter++; + yaz_mutex_leave(http_sessions->mutex); } // Decode settings parameters and apply to session // Syntax: setting[target]=value static int process_settings(struct session *se, struct http_request *rq, - struct http_response *rs) + struct http_response *rs) { struct http_argument *a; + NMEM nmem = nmem_create(); for (a = rq->arguments; a; a = a->next) if (strchr(a->name, '[')) @@ -220,200 +421,310 @@ static int process_settings(struct session *se, struct http_request *rq, char *setting; // Nmem_strsplit *rules*!!! - nmem_strsplit(se->session_nmem, "[]", a->name, &res, &num); + nmem_strsplit(nmem, "[]", a->name, &res, &num); if (num != 2) { error(rs, PAZPAR2_MALFORMED_SETTING, a->name); + nmem_destroy(nmem); return -1; } setting = res[0]; dbname = res[1]; - session_apply_setting(se, dbname, setting, - nmem_strdup(se->session_nmem, a->value)); + session_apply_setting(se, dbname, setting, a->value); } + nmem_destroy(nmem); return 0; } static void cmd_exit(struct http_channel *c) { yaz_log(YLOG_WARN, "exit"); - http_close_server(); + + response_open_ok(c, "exit"); + response_close(c, "exit"); + if (global_parameters.debug_mode) + http_close_server(c->server); } static void cmd_init(struct http_channel *c) { + struct http_request *r = c->request; + const char *clear = http_argbyname(r, "clear"); + const char *content_type = http_lookup_header(r->headers, "Content-Type"); unsigned int sesid; - char buf[1024]; - const char *clear = http_argbyname(c->request, "clear"); - struct http_session *s = http_session_create(); + struct http_session *s; struct http_response *rs = c->response; + struct conf_service *service = 0; /* no service (yet) */ + + if (r->content_len && content_type && + !yaz_strcmp_del("text/xml", content_type, "; ")) + { + xmlDoc *doc = xmlParseMemory(r->content_buf, r->content_len); + xmlNode *root_n; + if (!doc) + { + error(rs, PAZPAR2_MALFORMED_SETTING, 0); + return; + } + root_n = xmlDocGetRootElement(doc); + service = service_create(c->server, root_n); + xmlFreeDoc(doc); + if (!service) + { + error(rs, PAZPAR2_MALFORMED_SETTING, 0); + return; + } + } + + if (!service) + { + const char *service_name = http_argbyname(c->request, "service"); + service = locate_service(c->server, service_name); + if (!service) + { + error(rs, PAZPAR2_NO_SERVICE, service_name ? service_name : "unnamed"); + return; + } + } + sesid = make_sessionid(); + s = http_session_create(service, c->http_sessions, sesid); - yaz_log(YLOG_DEBUG, "HTTP Session init"); if (!clear || *clear == '0') session_init_databases(s->psession); else - yaz_log(YLOG_LOG, "No databases preloaded"); - sesid = make_sessionid(); - s->session_id = sesid; + session_log(s->psession, YLOG_LOG, "No databases preloaded"); + if (process_settings(s->psession, c->request, c->response) < 0) return; - sprintf(buf, "OK%u" - "" PAZPAR2_PROTOCOL_VERSION "", sesid); - rs->payload = nmem_strdup(c->nmem, buf); - http_send_response(c); + + response_open_ok(c, "init"); + wrbuf_printf(c->wrbuf, "%d", sesid); + if (c->server->server_id) + { + wrbuf_puts(c->wrbuf, "."); + wrbuf_puts(c->wrbuf, c->server->server_id); + } + wrbuf_puts(c->wrbuf, "" + "" PAZPAR2_PROTOCOL_VERSION ""); + + wrbuf_printf(c->wrbuf, "%d\n", + 1000 * ((s->psession->service->session_timeout >= 20) ? + (s->psession->service->session_timeout - 10) : 50)); + response_close(c, "init"); +} + +static void apply_local_setting(void *client_data, + struct setting *set) +{ + struct session *se = (struct session *) client_data; + + session_apply_setting(se, set->target, set->name, set->value); } static void cmd_settings(struct http_channel *c) { struct http_response *rs = c->response; struct http_request *rq = c->request; - struct http_session *s = locate_session(rq, rs); + struct http_session *s = locate_session(c); + const char *content_type = http_lookup_header(rq->headers, "Content-Type"); if (!s) return; + if (rq->content_len && content_type && + !yaz_strcmp_del("text/xml", content_type, "; ")) + { + xmlDoc *doc = xmlParseMemory(rq->content_buf, rq->content_len); + xmlNode *root_n; + int ret; + if (!doc) + { + error(rs, PAZPAR2_MALFORMED_SETTING, 0); + release_session(c, s); + return; + } + root_n = xmlDocGetRootElement(doc); + ret = settings_read_node_x(root_n, s->psession, apply_local_setting); + xmlFreeDoc(doc); + if (ret) + { + error(rs, PAZPAR2_MALFORMED_SETTING, 0); + release_session(c, s); + return; + } + } if (process_settings(s->psession, rq, rs) < 0) + { + release_session(c, s); return; - rs->payload = "OK"; - http_send_response(c); + } + response_open_ok(c, "settings"); + response_close(c, "settings"); + release_session(c, s); } -// Compares two hitsbytarget nodes by hitcount -static int cmp_ht(const void *p1, const void *p2) +static void termlist_response(struct http_channel *c, struct http_session *s, + const char *cmd_status) { - const struct hitsbytarget *h1 = p1; - const struct hitsbytarget *h2 = p2; - return h2->hits - h1->hits; -} + struct http_request *rq = c->request; + const char *name = http_argbyname(rq, "name"); + const char *nums = http_argbyname(rq, "num"); + int version = get_version(rq); + int num = 15; + int status; -// This implements functionality somewhat similar to 'bytarget', but in a termlist form -static void targets_termlist(WRBUF wrbuf, struct session *se, int num, - NMEM nmem) -{ - struct hitsbytarget *ht; - int count, i; + if (nums) + num = atoi(nums); - ht = hitsbytarget(se, &count, nmem); - qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht); - for (i = 0; i < count && i < num && ht[i].hits > 0; i++) - { + status = session_active_clients(s->psession); - // do only print terms which have display names - - wrbuf_puts(wrbuf, "\n"); + response_open_command(c, "termlist"); + /* new protocol add a status to response. Triggered by a status parameter */ + if (cmd_status != 0) + wrbuf_printf(c->wrbuf, "%s\n", cmd_status); + wrbuf_printf(c->wrbuf, "%d\n", status); - wrbuf_puts(wrbuf, ""); - wrbuf_xmlputs(wrbuf, ht[i].id); - wrbuf_puts(wrbuf, "\n"); - - wrbuf_puts(wrbuf, ""); - if (!ht[i].name || !ht[i].name[0]) - wrbuf_xmlputs(wrbuf, "NO TARGET NAME"); - else - wrbuf_xmlputs(wrbuf, ht[i].name); - wrbuf_puts(wrbuf, "\n"); - - wrbuf_printf(wrbuf, "%d\n", ht[i].hits); - - wrbuf_puts(wrbuf, ""); - wrbuf_xmlputs(wrbuf, ht[i].state); - wrbuf_puts(wrbuf, "\n"); - - wrbuf_printf(wrbuf, "%d\n", - ht[i].diagnostic); - wrbuf_puts(wrbuf, "\n"); + perform_termlist(c, s->psession, name, num, version); + + response_close(c, "termlist"); +} + +static void termlist_result_ready(void *data) +{ + struct http_channel *c = (struct http_channel *) data; + struct http_request *rq = c->request; + const char *report = http_argbyname(rq, "report"); + const char *status = 0; + struct http_session *s = locate_session(c); + if (report && !strcmp("status", report)) + status = "OK"; + if (s) + { + session_log(s->psession, c->http_sessions->log_level, + "termlist watch released"); + termlist_response(c, s, status); + release_session(c, s); } } static void cmd_termlist(struct http_channel *c) { - struct http_response *rs = c->response; struct http_request *rq = c->request; - struct http_session *s = locate_session(rq, rs); - struct termlist_score **p; - int len; - int i; - char *name = http_argbyname(rq, "name"); - char *nums = http_argbyname(rq, "num"); - int num = 15; - int status; - + struct http_response *rs = c->response; + struct http_session *s = locate_session(c); + const char *block = http_argbyname(rq, "block"); + const char *report = http_argbyname(rq, "report"); + int report_status = 0; + int report_error = 0; + const char *status_message = 0; + int active_clients; + + if (report && !strcmp("error", report)) + { + report_error = 1; + status_message = "OK"; + } + if (report && !strcmp("status", report)) + { + report_status = 1; + status_message = "OK"; + } if (!s) return; - status = session_active_clients(s->psession); + active_clients = session_active_clients(s->psession); + if (block && !strcmp("1", block) && active_clients) + { + // if there is already a watch/block. we do not block this one + if (session_set_watch(s->psession, SESSION_WATCH_TERMLIST, + termlist_result_ready, c, c) != 0) + { + session_log(s->psession, YLOG_WARN, "Attempt to block " + "multiple times on termlist block. Not supported!"); + if (report_error) { + error(rs, PAZPAR2_ALREADY_BLOCKED, "termlist"); + release_session(c, s); + return; + } + else if (report_status) + status_message = "WARNING (Already blocked on termlist)"; + else + session_log(s->psession, YLOG_WARN, + "Ignoring termlist block. Return current result"); + } + else + { + session_log(s->psession, c->http_sessions->log_level, + "Blocking on command termlist"); + release_session(c, s); + return; + } + } - if (!name) - name = "subject"; - if (strlen(name) > 255) - return; - if (nums) - num = atoi(nums); + termlist_response(c, s, status_message); + release_session(c, s); +} - wrbuf_rewind(c->wrbuf); +size_t session_get_memory_status(struct session *session); - wrbuf_puts(c->wrbuf, "\n"); - wrbuf_printf(c->wrbuf, "%d\n", status); - while (*name) - { - char tname[256]; - char *tp; +static void session_status(struct http_channel *c, struct http_session *s) +{ + size_t session_nmem; + wrbuf_printf(c->wrbuf, "%u\n", + s->activity_counter); + wrbuf_printf(c->wrbuf, "%zu\n", + nmem_total(s->nmem) ); + session_nmem = session_get_memory_status(s->psession); + wrbuf_printf(c->wrbuf, "%zu\n", session_nmem); +} - if (!(tp = strchr(name, ','))) - tp = name + strlen(name); - strncpy(tname, name, tp - name); - tname[tp - name] = '\0'; +static void cmd_service(struct http_channel *c) +{ + struct http_session *s = locate_session(c); + if (!s) + return; - wrbuf_puts(c->wrbuf, "wrbuf, tname); - wrbuf_puts(c->wrbuf, "\">\n"); - if (!strcmp(tname, "xtargets")) - targets_termlist(c->wrbuf, s->psession, num, c->nmem); - else - { - p = termlist(s->psession, tname, &len); - if (p) - for (i = 0; i < len && i < num; i++){ - // prevnt sending empty term elements - if (!p[i]->term || !p[i]->term[0]) - continue; - - wrbuf_puts(c->wrbuf, ""); - wrbuf_puts(c->wrbuf, ""); - wrbuf_xmlputs(c->wrbuf, p[i]->term); - wrbuf_puts(c->wrbuf, ""); - - wrbuf_printf(c->wrbuf, - "%d", - p[i]->frequency); - wrbuf_puts(c->wrbuf, "\n"); - } - } - wrbuf_puts(c->wrbuf, "\n"); - name = tp; - if (*name == ',') - name++; - } - wrbuf_puts(c->wrbuf, "\n"); - rs->payload = nmem_strdup(rq->channel->nmem, wrbuf_cstr(c->wrbuf)); - http_send_response(c); + response_open_command(c, 0); + if (s->psession->service->xml_node) + wrbuf_puts(c->wrbuf, s->psession->service->xml_node); + response_close(c, 0); + release_session(c, s); } +static void cmd_session_status(struct http_channel *c) +{ + struct http_session *s = locate_session(c); + if (!s) + return; + + response_open_ok(c, "session-status"); + session_status(c, s); + response_close(c, "session-status"); + release_session(c, s); +} -static void cmd_bytarget(struct http_channel *c) +static void bytarget_response(struct http_channel *c, struct http_session *s, + const char *cmd_status) { - struct http_response *rs = c->response; - struct http_request *rq = c->request; - struct http_session *s = locate_session(rq, rs); - struct hitsbytarget *ht; int count, i; + struct http_request *rq = c->request; + const char *settings = http_argbyname(rq, "settings"); + int version = get_version(rq); + struct hitsbytarget *ht = get_hitsbytarget(s->psession, &count, c->nmem); - if (!s) - return; - ht = hitsbytarget(s->psession, &count, c->nmem); - wrbuf_rewind(c->wrbuf); - wrbuf_puts(c->wrbuf, "OK"); + if (!cmd_status) + /* Old protocol, always ok */ + response_open_ok(c, "bytarget"); + else + { + /* New protocol, OK or WARNING (...)*/ + response_open_command(c, "bytarget"); + wrbuf_printf(c->wrbuf, "%s", cmd_status); + } + if (count == 0) + session_log(s->psession, YLOG_WARN, + "Empty bytarget Response. No targets found!"); for (i = 0; i < count; i++) { wrbuf_puts(c->wrbuf, "\n"); @@ -422,24 +733,138 @@ static void cmd_bytarget(struct http_channel *c) wrbuf_xmlputs(c->wrbuf, ht[i].id); wrbuf_puts(c->wrbuf, "\n"); - wrbuf_printf(c->wrbuf, "%d\n", ht[i].hits); - wrbuf_printf(c->wrbuf, "%d\n", ht[i].diagnostic); - wrbuf_printf(c->wrbuf, "%d\n", ht[i].records); + if (ht[i].name && ht[i].name[0]) + { + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, ht[i].name); + wrbuf_puts(c->wrbuf, "\n"); + } + wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF "\n", ht[i].hits); + wrbuf_printf(c->wrbuf, "%d\n", + ht[i].diagnostic); + if (ht[i].diagnostic) + { + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, ht[i].message); + wrbuf_puts(c->wrbuf, "\n"); + wrbuf_puts(c->wrbuf, ""); + if (ht[i].addinfo) + wrbuf_xmlputs(c->wrbuf, ht[i].addinfo); + wrbuf_puts(c->wrbuf, "\n"); + } + + wrbuf_printf(c->wrbuf, "%d\n", + ht[i].records - ht[i].filtered); + wrbuf_printf(c->wrbuf, "%d\n", ht[i].filtered); + if (version >= 2) + { + wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF + "\n", ht[i].approximation); + } wrbuf_puts(c->wrbuf, ""); wrbuf_xmlputs(c->wrbuf, ht[i].state); wrbuf_puts(c->wrbuf, "\n"); - + if (settings && *settings == '1') + { + wrbuf_puts(c->wrbuf, "\n"); + wrbuf_puts(c->wrbuf, ht[i].settings_xml); + wrbuf_puts(c->wrbuf, "\n"); + } + if (ht[i].suggestions_xml && ht[i].suggestions_xml[0]) + { + wrbuf_puts(c->wrbuf, ""); + wrbuf_puts(c->wrbuf, ht[i].suggestions_xml); + wrbuf_puts(c->wrbuf, ""); + } + if (ht[i].query_data) + { + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, ht[i].query_type); + wrbuf_puts(c->wrbuf, "\n"); + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, ht[i].query_data); + wrbuf_puts(c->wrbuf, "\n"); + } wrbuf_puts(c->wrbuf, ""); } + response_close(c, "bytarget"); +} - wrbuf_puts(c->wrbuf, ""); - rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); - http_send_response(c); +static void bytarget_result_ready(void *data) +{ + struct http_channel *c = (struct http_channel *) data; + struct http_session *s = locate_session(c); + const char *status_message = "OK"; + if (s) + { + session_log(s->psession, c->http_sessions->log_level, + "bytarget watch released"); + bytarget_response(c, s, status_message); + release_session(c, s); + } + else + yaz_log(c->http_sessions->log_level, + "No Session found for released bytarget watch"); +} + + +static void cmd_bytarget(struct http_channel *c) +{ + struct http_request *rq = c->request; + struct http_response *rs = c->response; + struct http_session *s = locate_session(c); + const char *block = http_argbyname(rq, "block"); + const char *report = http_argbyname(rq, "report"); + int report_error = 0; + int report_status = 0; + const char *status_message = "OK"; + int no_active; + + if (report && !strcmp("error", report)) + report_error = 1; + if (report && !strcmp("status", report)) + report_status = 1; + + if (!s) + return; + + no_active = session_active_clients(s->psession); + if (block && !strcmp("1", block) && no_active) + { + // if there is already a watch/block. we do not block this one + if (session_set_watch(s->psession, SESSION_WATCH_BYTARGET, + bytarget_result_ready, c, c) != 0) + { + session_log(s->psession, YLOG_WARN, "Attempt to block " + "multiple times on bytarget block. Not supported!"); + if (report_error) + { + error(rs, PAZPAR2_ALREADY_BLOCKED, "bytarget"); + release_session(c, s); + return; + } + else if (report_status) + status_message = "WARNING (Already blocked on bytarget)"; + else + session_log(s->psession, YLOG_WARN, "Ignoring bytarget block." + " Return current result."); + } + else + { + session_log(s->psession, c->http_sessions->log_level, + "Blocking on command bytarget"); + release_session(c, s); + return; + } + } + bytarget_response(c, s, status_message); + release_session(c, s); } static void write_metadata(WRBUF w, struct conf_service *service, - struct record_metadata **ml, int full) + struct record_metadata **ml, unsigned flags, + int indent) { int imeta; @@ -447,47 +872,69 @@ static void write_metadata(WRBUF w, struct conf_service *service, { struct conf_metadata *cmd = &service->metadata[imeta]; struct record_metadata *md; - if (!cmd->brief && !full) + if (!cmd->brief && !(flags & 1)) continue; for (md = ml[imeta]; md; md = md->next) { - wrbuf_printf(w, "\n", cmd->name); + struct record_metadata_attr *attr = md->attributes; + int i; + for (i = 0; i < indent; i++) + wrbuf_putc(w, ' '); + wrbuf_printf(w, "name); + for (; attr; attr = attr->next) + { + wrbuf_printf(w, " %s=\"", attr->name); + wrbuf_xmlputs(w, attr->value); + wrbuf_puts(w, "\""); + } + wrbuf_puts(w, ">"); switch (cmd->type) { case Metadata_type_generic: - wrbuf_xmlputs(w, md->data.text.disp); + if (md->data.text.snippet && (flags & 2)) + wrbuf_puts(w, md->data.text.snippet); + else + wrbuf_xmlputs(w, md->data.text.disp); break; case Metadata_type_year: wrbuf_printf(w, "%d", md->data.number.min); if (md->data.number.min != md->data.number.max) wrbuf_printf(w, "-%d", md->data.number.max); break; + case Metadata_type_float: + wrbuf_printf(w, "%f", md->data.fnumber); + break; default: wrbuf_puts(w, "[can't represent]"); + break; } - wrbuf_printf(w, "", cmd->name); + wrbuf_printf(w, "\n", cmd->name); } } } static void write_subrecord(struct record *r, WRBUF w, - struct conf_service *service, int show_details) + struct conf_service *service, unsigned flags, + int indent) { const char *name = session_setting_oneval( client_get_database(r->client), PZ_NAME); - wrbuf_puts(w, "client)->database->url); - wrbuf_puts(w, "\" "); + wrbuf_puts(w, " client)); + wrbuf_puts(w, "\"\n"); - wrbuf_puts(w, "name=\""); + wrbuf_puts(w, " name=\""); wrbuf_xmlputs(w, *name ? name : "Unknown"); - wrbuf_puts(w, "\">"); + wrbuf_puts(w, "\" "); + + wrbuf_puts(w, "checksum=\""); + wrbuf_printf(w, "%u", r->checksum); + wrbuf_puts(w, "\">\n"); - if (show_details) - write_metadata(w, service, r->metadata, 1); - wrbuf_puts(w, "\n"); + write_metadata(w, service, r->metadata, flags, indent); + wrbuf_puts(w, " \n"); } static void show_raw_record_error(void *data, const char *addinfo) @@ -539,114 +986,164 @@ void show_raw_reset(void *data, struct http_channel *c, void *data2) static void cmd_record_ready(void *data); -static void cmd_record(struct http_channel *c) +static void show_record(struct http_channel *c, struct http_session *s) { struct http_response *rs = c->response; struct http_request *rq = c->request; - struct http_session *s = locate_session(rq, rs); - struct record_cluster *rec; - struct record *r; - struct conf_service *service = global_parameters.server->service; + struct record_cluster *rec, *prev_r, *next_r; + struct conf_service *service; const char *idstr = http_argbyname(rq, "id"); const char *offsetstr = http_argbyname(rq, "offset"); const char *binarystr = http_argbyname(rq, "binary"); - + const char *checksumstr = http_argbyname(rq, "checksum"); + const char *snippets = http_argbyname(rq, "snippets"); + unsigned flags = (snippets && *snippets == '1') ? 3 : 1; + if (!s) return; + service = s->psession->service; if (!idstr) { error(rs, PAZPAR2_MISSING_PARAMETER, "id"); return; } wrbuf_rewind(c->wrbuf); - if (!(rec = show_single(s->psession, idstr))) + if (!(rec = show_single_start(s->psession, idstr, &prev_r, &next_r))) { - if (session_set_watch(s->psession, SESSION_WATCH_RECORD, + if (session_active_clients(s->psession) == 0) + { + error(rs, PAZPAR2_RECORD_MISSING, idstr); + } + else if (session_set_watch(s->psession, SESSION_WATCH_RECORD, cmd_record_ready, c, c) != 0) { error(rs, PAZPAR2_RECORD_MISSING, idstr); } return; } - if (offsetstr) + if (offsetstr || checksumstr) { - int offset = atoi(offsetstr); const char *syntax = http_argbyname(rq, "syntax"); const char *esn = http_argbyname(rq, "esn"); int i; struct record*r = rec->records; int binary = 0; + const char *nativesyntax = http_argbyname(rq, "nativesyntax"); if (binarystr && *binarystr != '0') binary = 1; - for (i = 0; i < offset && r; r = r->next, i++) - ; - if (!r) + if (checksumstr) { - error(rs, PAZPAR2_RECORD_FAIL, "no record at offset given"); - return; + unsigned v = strtoul(checksumstr, 0, 10); + for (i = 0; r; r = r->next) + if (v == r->checksum) + break; + if (!r) + error(rs, PAZPAR2_RECORD_FAIL, "no record"); } else { - void *data2; + int offset = atoi(offsetstr); + for (i = 0; i < offset && r; r = r->next, i++) + ; + if (!r) + error(rs, PAZPAR2_RECORD_FAIL, "no record at offset given"); + } + if (r) + { http_channel_observer_t obs = http_add_observer(c, r->client, show_raw_reset); - int ret = - client_show_raw_begin(r->client, r->position, syntax, esn, - obs /* data */, - show_raw_record_error, - (binary ? - show_raw_record_ok_binary : - show_raw_record_ok), - &data2, - (binary ? 1 : 0)); + int ret = client_show_raw_begin(r->client, r->position, + syntax, esn, + obs /* data */, + show_raw_record_error, + (binary ? + show_raw_record_ok_binary : + show_raw_record_ok), + (binary ? 1 : 0), + nativesyntax); if (ret == -1) { http_remove_observer(obs); error(rs, PAZPAR2_NO_SESSION, 0); - return; } } } else { - wrbuf_puts(c->wrbuf, "\n"); - wrbuf_puts(c->wrbuf, ""); + struct record *r; + response_open_command(c, "record"); + wrbuf_puts(c->wrbuf, "\n "); wrbuf_xmlputs(c->wrbuf, rec->recid); wrbuf_puts(c->wrbuf, "\n"); - write_metadata(c->wrbuf, service, rec->metadata, 1); + if (prev_r) + { + wrbuf_puts(c->wrbuf, " "); + wrbuf_xmlputs(c->wrbuf, prev_r->recid); + wrbuf_puts(c->wrbuf, "\n"); + } + if (next_r) + { + wrbuf_puts(c->wrbuf, " "); + wrbuf_xmlputs(c->wrbuf, next_r->recid); + wrbuf_puts(c->wrbuf, "\n"); + } + wrbuf_printf(c->wrbuf, " %d\n", + session_active_clients(s->psession)); + write_metadata(c->wrbuf, service, rec->metadata, flags, 1); for (r = rec->records; r; r = r->next) - write_subrecord(r, c->wrbuf, service, 1); - wrbuf_puts(c->wrbuf, "\n"); - rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); - http_send_response(c); + write_subrecord(r, c->wrbuf, service, flags, 2); + response_close(c, "record"); } + show_single_stop(s->psession, rec); } static void cmd_record_ready(void *data) { struct http_channel *c = (struct http_channel *) data; + struct http_session *s = locate_session(c); + if (s) + { + session_log(s->psession, c->http_sessions->log_level, + "record watch released"); + show_record(c, s); + release_session(c, s); + } +} - cmd_record(c); +static void cmd_record(struct http_channel *c) +{ + struct http_session *s = locate_session(c); + if (s) + { + show_record(c, s); + release_session(c, s); + } } -static void show_records(struct http_channel *c, int active) + +static void show_records(struct http_channel *c, struct http_session *s, + int active) { struct http_request *rq = c->request; struct http_response *rs = c->response; - struct http_session *s = locate_session(rq, rs); struct record_cluster **rl; struct reclist_sortparms *sp; - char *start = http_argbyname(rq, "start"); - char *num = http_argbyname(rq, "num"); - char *sort = http_argbyname(rq, "sort"); + const char *start = http_argbyname(rq, "start"); + const char *num = http_argbyname(rq, "num"); + const char *sort = http_argbyname(rq, "sort"); + int version = get_version(rq); + const char *snippets = http_argbyname(rq, "snippets"); + unsigned flags = (snippets && *snippets == '1') ? 2 : 0; + int startn = 0; int numn = 20; int total; - int total_hits; + Odr_int total_hits; + Odr_int approx_hits; int i; - + struct conf_service *service = 0; if (!s) return; @@ -658,21 +1155,30 @@ static void show_records(struct http_channel *c, int active) startn = atoi(start); if (num) numn = atoi(num); + + service = s->psession->service; if (!sort) - sort = "relevance"; - if (!(sp = reclist_parse_sortparms(c->nmem, sort))) + sort = service->default_sort; + if (!(sp = reclist_parse_sortparms(c->nmem, sort, service))) { error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort"); return; + } - rl = show(s->psession, sp, startn, &numn, &total, &total_hits, c->nmem); + rl = show_range_start(s->psession, sp, startn, &numn, &total, + &total_hits, &approx_hits, show_records_ready, c); + if (!rl) + return; - wrbuf_rewind(c->wrbuf); - wrbuf_puts(c->wrbuf, "\nOK\n"); - wrbuf_printf(c->wrbuf, "%d\n", active); + response_open_ok(c, "show"); + wrbuf_printf(c->wrbuf, "\n%d\n", active); wrbuf_printf(c->wrbuf, "%d\n", total); - wrbuf_printf(c->wrbuf, "%d\n", total_hits); + wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF "\n", total_hits); + if (version >= 2) + wrbuf_printf(c->wrbuf, "" ODR_INT_PRINTF + "\n", approx_hits); + wrbuf_printf(c->wrbuf, "%d\n", startn); wrbuf_printf(c->wrbuf, "%d\n", numn); @@ -681,187 +1187,306 @@ static void show_records(struct http_channel *c, int active) int ccount; struct record *p; struct record_cluster *rec = rl[i]; - struct conf_service *service = global_parameters.server->service; + struct conf_service *service = s->psession->service; wrbuf_puts(c->wrbuf, "\n"); - write_metadata(c->wrbuf, service, rec->metadata, 0); + write_metadata(c->wrbuf, service, rec->metadata, flags, 1); for (ccount = 0, p = rl[i]->records; p; p = p->next, ccount++) - write_subrecord(p, c->wrbuf, service, 0); // subrecs w/o details - if (ccount > 1) - wrbuf_printf(c->wrbuf, "%d\n", ccount); - wrbuf_puts(c->wrbuf, ""); + write_subrecord(p, c->wrbuf, service, flags, 2); + wrbuf_printf(c->wrbuf, " %d\n", ccount); + if (strstr(sort, "relevance")) + { + wrbuf_printf(c->wrbuf, " %d\n", + rec->relevance_score); + if (service->rank_debug) + { + wrbuf_printf(c->wrbuf, " \n"); + wrbuf_xmlputs(c->wrbuf, wrbuf_cstr(rec->relevance_explain1)); + wrbuf_xmlputs(c->wrbuf, wrbuf_cstr(rec->relevance_explain2)); + wrbuf_printf(c->wrbuf, " \n"); + } + } + wrbuf_puts(c->wrbuf, " "); wrbuf_xmlputs(c->wrbuf, rec->recid); wrbuf_puts(c->wrbuf, "\n"); wrbuf_puts(c->wrbuf, "\n"); } - wrbuf_puts(c->wrbuf, "\n"); - rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); - http_send_response(c); + show_range_stop(s->psession, rl); + + response_close(c, "show"); } static void show_records_ready(void *data) { struct http_channel *c = (struct http_channel *) data; - - show_records(c, -1); + struct http_session *s = locate_session(c); + if (s) + { + session_log(s->psession, c->http_sessions->log_level, + "show watch released"); + show_records(c, s, -1); + } + else { + /* some error message */ + } + release_session(c, s); } static void cmd_show(struct http_channel *c) { - struct http_request *rq = c->request; + struct http_request *rq = c->request; struct http_response *rs = c->response; - struct http_session *s = locate_session(rq, rs); - char *block = http_argbyname(rq, "block"); + struct http_session *s = locate_session(c); + const char *block = http_argbyname(rq, "block"); + const char *sort = http_argbyname(rq, "sort"); + const char *block_error = http_argbyname(rq, "report"); + const char *mergekey = http_argbyname(rq, "mergekey"); + const char *rank = http_argbyname(rq, "rank"); + struct conf_service *service = 0; + struct reclist_sortparms *sp; int status; + int report_error = 0; + if (block_error && !strcmp("1", block_error)) + report_error = 1; if (!s) return; + service = s->psession->service; + if (!sort) + sort = service->default_sort; + if (!(sp = reclist_parse_sortparms(c->nmem, sort, service))) + { + error(c->response, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort"); + release_session(c, s); + return; + } + session_sort(s->psession, sp, mergekey, rank); status = session_active_clients(s->psession); - if (block) + if (block && reclist_get_num_records(s->psession->reclist) == 0) { - if (status && (!s->psession->reclist || !s->psession->reclist->num_records)) + if (!strcmp(block, "preferred") + && !session_is_preferred_clients_ready(s->psession) + && reclist_get_num_records(s->psession->reclist) == 0) + { + // if there is already a watch/block. we do not block this one + if (session_set_watch(s->psession, SESSION_WATCH_SHOW_PREF, + show_records_ready, c, c) == 0) + { + session_log(s->psession, c->http_sessions->log_level, + "Blocking on command show (preferred targets)"); + release_session(c, s); + return; + } + else + { + session_log(s->psession, YLOG_WARN, "Attempt to block" + " multiple times on show (preferred targets) block." + " Not supported!"); + if (report_error) + { + error(rs, PAZPAR2_ALREADY_BLOCKED, + "show (preferred targets)"); + release_session(c, s); + return; + } + else + session_log(s->psession, YLOG_WARN, + "Ignoring show(preferred) block." + " Returning current result"); + } + + } + else if (status) { // if there is already a watch/block. we do not block this one if (session_set_watch(s->psession, SESSION_WATCH_SHOW, show_records_ready, c, c) != 0) { - yaz_log(YLOG_DEBUG, "Blocking on cmd_show"); + session_log(s->psession, YLOG_WARN, "Attempt to block" + " multiple times on show block. Not supported!"); + if (report_error) + { + error(rs, PAZPAR2_ALREADY_BLOCKED, "show"); + release_session(c, s); + return; + } + else + session_log(s->psession, YLOG_WARN, "Ignoring show block." + " Returning current result"); + } + else + { + session_log(s->psession, c->http_sessions->log_level, + "Blocking on command show"); + release_session(c, s); + return; } - return; } } - - show_records(c, status); + show_records(c, s, status); + release_session(c, s); } static void cmd_ping(struct http_channel *c) { - struct http_request *rq = c->request; - struct http_response *rs = c->response; - struct http_session *s = locate_session(rq, rs); + struct http_session *s = locate_session(c); if (!s) return; - rs->payload = "OK"; - http_send_response(c); -} - -static int utf_8_valid(const char *str) -{ - yaz_iconv_t cd = yaz_iconv_open("utf-8", "utf-8"); - if (cd) - { - /* check that query is UTF-8 encoded */ - char *inbuf = (char *) str; /* we know iconv does not alter this */ - size_t inbytesleft = strlen(inbuf); - - size_t outbytesleft = strlen(inbuf) + 10; - char *out = xmalloc(outbytesleft); - char *outbuf = out; - size_t r = yaz_iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft); - - /* if OK, try flushing the rest */ - if (r != (size_t) (-1)) - r = yaz_iconv(cd, 0, 0, &outbuf, &outbytesleft); - yaz_iconv_close(cd); - xfree(out); - if (r == (size_t) (-1)) - return 0; - } - return 1; + response_open_ok(c, "ping"); + response_close(c, "ping"); + release_session(c, s); } static void cmd_search(struct http_channel *c) { struct http_request *rq = c->request; struct http_response *rs = c->response; - struct http_session *s = locate_session(rq, rs); - char *query = http_argbyname(rq, "query"); - char *filter = http_argbyname(rq, "filter"); + struct http_session *s = locate_session(c); + const char *query = http_argbyname(rq, "query"); + const char *filter = http_argbyname(rq, "filter"); + const char *maxrecs = http_argbyname(rq, "maxrecs"); + const char *startrecs = http_argbyname(rq, "startrecs"); + const char *limit = http_argbyname(rq, "limit"); + const char *sort = http_argbyname(rq, "sort"); + const char *mergekey = http_argbyname(rq, "mergekey"); + const char *rank = http_argbyname(rq, "rank"); enum pazpar2_error_code code; const char *addinfo = 0; + const char *addinfo2 = 0; + struct reclist_sortparms *sp; + struct conf_service *service = 0; if (!s) return; + if (!query) { error(rs, PAZPAR2_MISSING_PARAMETER, "query"); + release_session(c, s); return; } - if (!utf_8_valid(query)) + if (!yaz_utf8_check(query)) { error(rs, PAZPAR2_MALFORMED_PARAMETER_ENCODING, "query"); + release_session(c, s); + return; + } + service = s->psession->service; + if (!sort) + sort = service->default_sort; + + if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service))) + { + error(c->response, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort"); + release_session(c, s); return; } - code = search(s->psession, query, filter, &addinfo); + + code = session_search(s->psession, query, startrecs, maxrecs, filter, limit, + &addinfo, &addinfo2, sp, mergekey, rank); if (code) { - error(rs, code, addinfo); + error2(rs, code, addinfo, addinfo2); + release_session(c, s); return; } - rs->payload = "OK"; - http_send_response(c); + response_open_ok(c, "search"); + response_close(c, "search"); + release_session(c, s); } static void cmd_stat(struct http_channel *c) { - struct http_request *rq = c->request; - struct http_response *rs = c->response; - struct http_session *s = locate_session(rq, rs); + struct http_session *s = locate_session(c); struct statistics stat; int clients; + float progress = 0; + if (!s) return; clients = session_active_clients(s->psession); statistics(s->psession, &stat); - wrbuf_rewind(c->wrbuf); - wrbuf_puts(c->wrbuf, ""); - wrbuf_printf(c->wrbuf, "%d\n", clients); - wrbuf_printf(c->wrbuf, "%d\n", stat.num_hits); - wrbuf_printf(c->wrbuf, "%d\n", stat.num_records); - wrbuf_printf(c->wrbuf, "%d\n", stat.num_clients); - wrbuf_printf(c->wrbuf, "%d\n", stat.num_no_connection); - wrbuf_printf(c->wrbuf, "%d\n", stat.num_connecting); - wrbuf_printf(c->wrbuf, "%d\n", stat.num_working); - wrbuf_printf(c->wrbuf, "%d\n", stat.num_idle); - wrbuf_printf(c->wrbuf, "%d\n", stat.num_failed); - wrbuf_printf(c->wrbuf, "%d\n", stat.num_error); - wrbuf_puts(c->wrbuf, ""); - rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); - http_send_response(c); + if (stat.num_clients > 0) + { + progress = (stat.num_clients - clients) / (float)stat.num_clients; + } + + response_open_command(c, "stat"); + wrbuf_printf(c->wrbuf, "\n %d\n", clients); + wrbuf_printf(c->wrbuf, " " ODR_INT_PRINTF "\n", stat.num_hits); + wrbuf_printf(c->wrbuf, " %d\n", stat.num_records); + wrbuf_printf(c->wrbuf, " %d\n", stat.num_clients); + wrbuf_printf(c->wrbuf, " %d\n", stat.num_no_connection); + wrbuf_printf(c->wrbuf, " %d\n", stat.num_connecting); + wrbuf_printf(c->wrbuf, " %d\n", stat.num_working); + wrbuf_printf(c->wrbuf, " %d\n", stat.num_idle); + wrbuf_printf(c->wrbuf, " %d\n", stat.num_failed); + wrbuf_printf(c->wrbuf, " %d\n", stat.num_error); + wrbuf_printf(c->wrbuf, " %.2f\n", progress); + response_close(c, "stat"); + release_session(c, s); +} + +static void cmd_stop(struct http_channel *c) +{ + struct http_session *s = locate_session(c); + if (!s) + return; + response_open_ok(c, "stop"); + session_stop(s->psession); + response_close(c, "stop"); + release_session(c, s); } static void cmd_info(struct http_channel *c) { char yaz_version_str[20]; - struct http_response *rs = c->response; + char yaz_sha1_str[42]; - wrbuf_rewind(c->wrbuf); - wrbuf_puts(c->wrbuf, "\n"); - wrbuf_puts(c->wrbuf, " \n"); - wrbuf_puts(c->wrbuf, ""); + response_open_command(c, "info"); + wrbuf_puts(c->wrbuf, "\n \n"); + wrbuf_puts(c->wrbuf, " wrbuf, " sha1=\"%s\"", PAZPAR2_VERSION_SHA1); +#endif + wrbuf_puts(c->wrbuf, ">"); wrbuf_xmlputs(c->wrbuf, VERSION); - wrbuf_puts(c->wrbuf, ""); + wrbuf_puts(c->wrbuf, "\n"); - - yaz_version(yaz_version_str, 0); + yaz_version(yaz_version_str, yaz_sha1_str); wrbuf_puts(c->wrbuf, " wrbuf, YAZ_VERSION); + wrbuf_puts(c->wrbuf, "\" sha1=\""); + wrbuf_xmlputs(c->wrbuf, yaz_sha1_str); wrbuf_puts(c->wrbuf, "\">"); wrbuf_xmlputs(c->wrbuf, yaz_version_str); wrbuf_puts(c->wrbuf, "\n"); wrbuf_puts(c->wrbuf, " \n"); - - wrbuf_puts(c->wrbuf, ""); - rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); - http_send_response(c); +#if HAVE_UNISTD_H + { + char hostname_str[64]; + if (gethostname(hostname_str, sizeof(hostname_str)) == 0) + { + wrbuf_puts(c->wrbuf, " "); + wrbuf_xmlputs(c->wrbuf, hostname_str); + wrbuf_puts(c->wrbuf, "\n"); + } + } +#endif + wrbuf_printf(c->wrbuf, " %d\n", sessions_get_count()); + wrbuf_printf(c->wrbuf, " %d\n", clients_get_count()); + print_meminfo(c->wrbuf); + info_services(c->server, c->wrbuf); + + response_close(c, "info"); } struct { @@ -876,15 +1501,18 @@ struct { { "search", cmd_search }, { "termlist", cmd_termlist }, { "exit", cmd_exit }, + { "session-status", cmd_session_status }, + { "service", cmd_service }, { "ping", cmd_ping }, { "record", cmd_record }, { "info", cmd_info }, + { "stop", cmd_stop }, {0,0} }; void http_command(struct http_channel *c) { - char *command = http_argbyname(c->request, "command"); + const char *command = http_argbyname(c->request, "command"); struct http_response *rs = http_create_response(c); int i; @@ -913,7 +1541,9 @@ void http_command(struct http_channel *c) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +