X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=eb799f039779d69ad3213738aac3947afe7e379a;hb=2cd4639d9c1f2f54935c393002cace28a4076a4b;hp=cfd4dc1d198662121a6330d3ac44b23767571dbb;hpb=15f236dc80e9d06944cc49289fd032d748e0c4bc;p=pazpar2-moved-to-github.git diff --git a/src/http_command.c b/src/http_command.c index cfd4dc1..eb799f0 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -1,7 +1,5 @@ -/* $Id: http_command.c,v 1.59 2007-09-05 07:24:04 adam Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + 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 @@ -14,52 +12,129 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Pazpar2; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -/* - * $Id: http_command.c,v 1.59 2007-09-05 07:24:04 adam Exp $ - */ +*/ +#if HAVE_CONFIG_H +#include +#endif #include #include -#include +#if HAVE_UNISTD_H #include +#endif #include -#include -#include +#include +#if HAVE_SYS_TIME_H #include -#include -#if HAVE_CONFIG_H -#include #endif - +#include #include -#include "config.h" -#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" + " \n", + minfo.arena, minfo.uordblks, minfo.fordblks,minfo.ordblks, minfo.keepcost, minfo.hblks, minfo.hblkhd, minfo.arena + minfo.hblkhd, minfo.uordblks + minfo.hblkhd); + +} +#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; + +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 sesions=%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); + destroy_session(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) @@ -68,39 +143,70 @@ 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 = new_session(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); + yaz_log(http_sessions->log_level, "%p Session %u created. timeout chan=%p timeout=%d", r, sesid, r->timeout_iochan, service->session_timeout); + iochan_settimeout(r->timeout_iochan, service->session_timeout); - pazpar2_add_channel(r->timeout_iochan); + iochan_add(service->server->iochan_man, r->timeout_iochan); + 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; + + yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed", s, s->session_id); + 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 */ + yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed", s, s->session_id); + iochan_destroy(s->timeout_iochan); + destroy_session(s->psession); + http_session_use(-1); + nmem_destroy(s->nmem); + } + else { + yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed delayed. Active clients (%d-%d). Waiting for new timeout.", + s, s->session_id, 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) @@ -121,6 +227,7 @@ 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_LAST_ERROR, "Last error"}, { 0, 0 } }; @@ -139,33 +246,39 @@ static void error(struct http_response *rs, const char *addinfo) { struct http_channel *c = rs->channel; - char text[1024]; + 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); - yaz_snprintf(text, sizeof(text), - "%s", (int) code, - msg, addinfo ? addinfo : ""); + wrbuf_printf(text, HTTP_COMMAND_RESPONSE_PREFIX "", (int) code, + msg); + if (addinfo) + wrbuf_xmlputs(text, addinfo); + wrbuf_puts(text, ""); yaz_log(YLOG_WARN, "HTTP %s %s%s%s", http_status, msg, addinfo ? ": " : "" , addinfo ? addinfo : ""); - rs->payload = nmem_strdup(c->nmem, text); + rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(text)); + wrbuf_destroy(text); http_send_response(c); } -unsigned int make_sessionid() +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 { +#ifdef WIN32 + res = seq; +#else struct timeval t; if (gettimeofday(&t, 0) < 0) @@ -177,14 +290,18 @@ unsigned int make_sessionid() (long long would be more appropriate)*/ res = t.tv_sec; res = ((res << 8) | (seq & 0xff)) & ((1U << 31) - 1); +#endif } 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_response *rs = c->response; + struct http_request *rq = c->request; 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) @@ -193,20 +310,33 @@ 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; @@ -235,46 +365,124 @@ static int process_settings(struct session *se, struct http_request *rq, static void cmd_exit(struct http_channel *c) { + char buf[1024]; + struct http_response *rs = c->response; yaz_log(YLOG_WARN, "exit"); - exit(0); + sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX "OK"); + rs->payload = nmem_strdup(c->nmem, buf); + http_send_response(c); + http_close_server(c->server); } static void cmd_init(struct http_channel *c) { - unsigned int sesid; char buf[1024]; - const char *clear = http_argbyname(c->request, "clear"); - struct http_session *s = http_session_create(); + 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; + struct http_session *s; struct http_response *rs = c->response; - - yaz_log(YLOG_DEBUG, "HTTP Session init"); + 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(c->http_sessions->log_level, "%p Session init %u ", s, sesid); if (!clear || *clear == '0') session_init_databases(s->psession); else - yaz_log(YLOG_LOG, "No databases preloaded"); - sesid = make_sessionid(); - s->session_id = sesid; + yaz_log(YLOG_LOG, "HTTP Session %u init: No databases preloaded", sesid); + if (process_settings(s->psession, c->request, c->response) < 0) return; - sprintf(buf, "OK%u" - "" PAZPAR2_PROTOCOL_VERSION "", sesid); + + sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX + "OK%d", sesid); + if (c->server->server_id) + { + strcat(buf, "."); + strcat(buf, c->server->server_id); + } + strcat(buf, "" + "" PAZPAR2_PROTOCOL_VERSION ""); rs->payload = nmem_strdup(c->nmem, buf); http_send_response(c); } +static void apply_local_setting(void *client_data, + struct setting *set) +{ + struct session *se = (struct session *) client_data; + + session_apply_setting(se, nmem_strdup(se->session_nmem, set->target), + nmem_strdup(se->session_nmem, set->name), + nmem_strdup(se->session_nmem, 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 (process_settings(s->psession, rq, rs) < 0) + 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; + if (!doc) + { + error(rs, PAZPAR2_MALFORMED_SETTING, 0); + return; + } + root_n = xmlDocGetRootElement(doc); + + settings_read_node_x(root_n, s->psession, apply_local_setting); + + xmlFreeDoc(doc); + } + if (process_settings(s->psession, rq, rs) < 0) { + release_session(c,s); return; - rs->payload = "OK"; + } + rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "OK"; http_send_response(c); + release_session(c,s); } // Compares two hitsbytarget nodes by hitcount @@ -286,7 +494,7 @@ static int cmp_ht(const void *p1, const void *p2) } // This implements functionality somewhat similar to 'bytarget', but in a termlist form -static void targets_termlist(WRBUF wrbuf, struct session *se, int num, +static int targets_termlist(WRBUF wrbuf, struct session *se, int num, NMEM nmem) { struct hitsbytarget *ht; @@ -312,7 +520,8 @@ static void targets_termlist(WRBUF wrbuf, struct session *se, int num, wrbuf_xmlputs(wrbuf, ht[i].name); wrbuf_puts(wrbuf, "\n"); - wrbuf_printf(wrbuf, "%d\n", ht[i].hits); + wrbuf_printf(wrbuf, "" ODR_INT_PRINTF "\n", + ht[i].hits); wrbuf_puts(wrbuf, ""); wrbuf_xmlputs(wrbuf, ht[i].state); @@ -322,20 +531,22 @@ static void targets_termlist(WRBUF wrbuf, struct session *se, int num, ht[i].diagnostic); wrbuf_puts(wrbuf, "\n"); } + return count; } 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 http_session *s = locate_session(c); struct termlist_score **p; int len; int i; - char *name = http_argbyname(rq, "name"); - char *nums = http_argbyname(rq, "num"); + const char *name = http_argbyname(rq, "name"); + const char *nums = http_argbyname(rq, "num"); int num = 15; int status; + WRBUF debug_log = wrbuf_alloc(); if (!s) return; @@ -356,22 +567,25 @@ static void cmd_termlist(struct http_channel *c) while (*name) { char tname[256]; - char *tp; + const char *tp; if (!(tp = strchr(name, ','))) tp = name + strlen(name); strncpy(tname, name, tp - name); tname[tp - name] = '\0'; - wrbuf_puts(c->wrbuf, "wrbuf, tname); wrbuf_puts(c->wrbuf, "\">\n"); - if (!strcmp(tname, "xtargets")) - targets_termlist(c->wrbuf, s->psession, num, c->nmem); + if (!strcmp(tname, "xtargets")) { + int targets = targets_termlist(c->wrbuf, s->psession, num, c->nmem); + wrbuf_printf(debug_log, " xtargets: %d", targets); + } else { p = termlist(s->psession, tname, &len); - if (p) + if (p && len) + wrbuf_printf(debug_log, " %s: %d", 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]) @@ -387,6 +601,7 @@ static void cmd_termlist(struct http_channel *c) p[i]->frequency); wrbuf_puts(c->wrbuf, "\n"); } + } } wrbuf_puts(c->wrbuf, "\n"); name = tp; @@ -394,8 +609,83 @@ static void cmd_termlist(struct http_channel *c) name++; } wrbuf_puts(c->wrbuf, "\n"); + yaz_log(YLOG_DEBUG, "termlist response: %s ", wrbuf_cstr(debug_log)); + wrbuf_destroy(debug_log); rs->payload = nmem_strdup(rq->channel->nmem, wrbuf_cstr(c->wrbuf)); http_send_response(c); + release_session(c,s); +} + +size_t session_get_memory_status(struct session *session); + +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); +} + +static void cmd_session_status(struct http_channel *c) { + struct http_response *rs = c->response; + struct http_session *s = locate_session(c); + if (!s) + return; + + wrbuf_rewind(c->wrbuf); + wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "OK\n"); + session_status(c, s); + wrbuf_puts(c->wrbuf, "\n"); + rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); + http_send_response(c); + release_session(c,s); + +} + +int sessions_count(void); +int clients_count(void); +#ifdef HAVE_RESULTSETS_COUNT +int resultsets_count(void); +#else +#define resultsets_count() 0 +#endif + +static void cmd_server_status(struct http_channel *c) +{ + struct http_response *rs = c->response; + int sessions = sessions_count(); + int clients = clients_count(); + int resultsets = resultsets_count(); + wrbuf_rewind(c->wrbuf); + wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "\n"); + wrbuf_printf(c->wrbuf, " %u\n", sessions); + wrbuf_printf(c->wrbuf, " %u\n", clients); + /* Only works if yaz has been compiled with enabling of this */ + wrbuf_printf(c->wrbuf, " %u\n",resultsets); + print_meminfo(c->wrbuf); + +/* TODO add all sessions status */ +/* http_sessions_t http_sessions = c->http_sessions; */ +/* struct http_session *p; */ +/* + yaz_mutex_enter(http_sessions->mutex); + for (p = http_sessions->session_list; p; p = p->next) { + p->activity_counter++; + wrbuf_puts(c->wrbuf, "\n"); + wrbuf_printf(c->wrbuf, "%s\n", p->session_id); + yaz_mutex_leave(http_sessions->mutex); + session_status(c, p); + wrbuf_puts(c->wrbuf, "\n"); + yaz_mutex_enter(http_sessions->mutex); + p->activity_counter--; + } + yaz_mutex_leave(http_sessions->mutex); +*/ + wrbuf_puts(c->wrbuf, "\n"); + rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); + http_send_response(c); + xmalloc_trav(0); } @@ -403,15 +693,16 @@ static void cmd_bytarget(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); struct hitsbytarget *ht; + const char *settings = http_argbyname(rq, "settings"); int count, i; if (!s) return; ht = hitsbytarget(s->psession, &count, c->nmem); wrbuf_rewind(c->wrbuf); - wrbuf_puts(c->wrbuf, "OK"); + wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "OK"); for (i = 0; i < count; i++) { @@ -421,20 +712,33 @@ 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); + 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); wrbuf_printf(c->wrbuf, "%d\n", ht[i].records); 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"); + } wrbuf_puts(c->wrbuf, ""); } wrbuf_puts(c->wrbuf, ""); rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); http_send_response(c); + release_session(c,s); } static void write_metadata(WRBUF w, struct conf_service *service, @@ -450,12 +754,20 @@ static void write_metadata(WRBUF w, struct conf_service *service, continue; for (md = ml[imeta]; md; md = md->next) { - wrbuf_printf(w, "\n", cmd->name); + struct record_metadata_attr *attr = md->attributes; + wrbuf_printf(w, "\nname); + 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); + wrbuf_xmlputs(w, md->data.text.disp); break; case Metadata_type_year: wrbuf_printf(w, "%d", md->data.number.min); @@ -484,8 +796,7 @@ static void write_subrecord(struct record *r, WRBUF w, wrbuf_xmlputs(w, *name ? name : "Unknown"); wrbuf_puts(w, "\">"); - if (show_details) - write_metadata(w, service, r->metadata, 1); + write_metadata(w, service, r->metadata, show_details); wrbuf_puts(w, "\n"); } @@ -513,34 +824,64 @@ static void show_raw_record_ok(void *data, const char *buf, size_t sz) http_send_response(c); } -void show_raw_reset(void *data, struct http_channel *c) + +static void show_raw_record_ok_binary(void *data, const char *buf, size_t sz) +{ + http_channel_observer_t obs = data; + struct http_channel *c = http_channel_observer_chan(obs); + struct http_response *rs = c->response; + + http_remove_observer(obs); + + wrbuf_write(c->wrbuf, buf, sz); + rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); + + rs->content_type = "application/octet-stream"; + http_send_response(c); +} + + +void show_raw_reset(void *data, struct http_channel *c, void *data2) { - struct client *client = data; - client_show_raw_reset(client); + //struct client *client = data; + //client_show_raw_remove(client, data2); } +static void cmd_record_ready(void *data); + static void cmd_record(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 record_cluster *rec; + struct http_session *s = locate_session(c); + struct record_cluster *rec, *prev_r, *next_r; struct record *r; - struct conf_service *service = global_parameters.server->service; + 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"); 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))) { - error(rs, PAZPAR2_RECORD_MISSING, idstr); + 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); + } + release_session(c, s); return; } if (offsetstr) @@ -550,33 +891,56 @@ static void cmd_record(struct http_channel *c) const char *esn = http_argbyname(rq, "esn"); int i; struct record*r = rec->records; + int binary = 0; + + if (binarystr && *binarystr != '0') + binary = 1; for (i = 0; i < offset && r; r = r->next, i++) ; if (!r) { error(rs, PAZPAR2_RECORD_FAIL, "no record at offset given"); - return; } else { http_channel_observer_t obs = http_add_observer(c, r->client, show_raw_reset); - if (client_show_raw_begin(r->client, r->position, syntax, esn, - obs /* data */, - show_raw_record_error, - show_raw_record_ok)) + 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)); + if (ret == -1) { http_remove_observer(obs); - error(rs, PAZPAR2_RECORD_FAIL, "invalid parameters"); - return; + error(rs, PAZPAR2_NO_SESSION, 0); } } } else { - wrbuf_puts(c->wrbuf, "\n"); - wrbuf_printf(c->wrbuf, "%s\n", rec->recid); + wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "\n"); + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, rec->recid); + wrbuf_puts(c->wrbuf, "\n"); + 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, 1); for (r = rec->records; r; r = r->next) write_subrecord(r, c->wrbuf, service, 1); @@ -584,22 +948,31 @@ static void cmd_record(struct http_channel *c) rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); http_send_response(c); } + show_single_stop(s->psession, rec); + release_session(c, s); +} + +static void cmd_record_ready(void *data) +{ + struct http_channel *c = (struct http_channel *) data; + + cmd_record(c); } static void show_records(struct http_channel *c, int active) { 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 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 startn = 0; int numn = 20; int total; - int total_hits; + Odr_int total_hits; int i; if (!s) @@ -615,19 +988,21 @@ static void show_records(struct http_channel *c, int active) numn = atoi(num); if (!sort) sort = "relevance"; - if (!(sp = reclist_parse_sortparms(c->nmem, sort))) + if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service))) { error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort"); + release_session(c, s); 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); wrbuf_rewind(c->wrbuf); - wrbuf_puts(c->wrbuf, "\nOK\n"); + wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "\nOK\n"); wrbuf_printf(c->wrbuf, "%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); wrbuf_printf(c->wrbuf, "%d\n", startn); wrbuf_printf(c->wrbuf, "%d\n", numn); @@ -636,7 +1011,7 @@ 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); @@ -644,13 +1019,21 @@ static void show_records(struct http_channel *c, int active) write_subrecord(p, c->wrbuf, service, 0); // subrecs w/o details if (ccount > 1) wrbuf_printf(c->wrbuf, "%d\n", ccount); - wrbuf_printf(c->wrbuf, "%s\n", rec->recid); + if (strstr(sort, "relevance")) + wrbuf_printf(c->wrbuf, "%d\n", + rec->relevance_score); + wrbuf_puts(c->wrbuf, ""); + wrbuf_xmlputs(c->wrbuf, rec->recid); + wrbuf_puts(c->wrbuf, "\n"); wrbuf_puts(c->wrbuf, "\n"); } + show_range_stop(s->psession, rl); + wrbuf_puts(c->wrbuf, "\n"); rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); http_send_response(c); + release_session(c, s); } static void show_records_ready(void *data) @@ -663,9 +1046,8 @@ static void show_records_ready(void *data) static void cmd_show(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 *block = http_argbyname(rq, "block"); + struct http_session *s = locate_session(c); + const char *block = http_argbyname(rq, "block"); int status; if (!s) @@ -675,31 +1057,43 @@ static void cmd_show(struct http_channel *c) if (block) { - 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) + { + yaz_log(c->http_sessions->log_level, + "%p Session %u: Blocking on cmd_show. Waiting for preferred targets", s, s->session_id); + } + release_session(c,s); + return; + + } + else if (status && 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_RECORDS, - show_records_ready, c, c) == 0) + if (session_set_watch(s->psession, SESSION_WATCH_SHOW, + show_records_ready, c, c) != 0) { - yaz_log(YLOG_DEBUG, "Blocking on cmd_show"); - return; + yaz_log(c->http_sessions->log_level, "%p Session %u: Blocking on cmd_show", s, s->session_id); } + release_session(c,s); + return; } } - show_records(c, 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"; + rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "OK"; http_send_response(c); + release_session(c, s); } static int utf_8_valid(const char *str) @@ -731,9 +1125,11 @@ 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"); enum pazpar2_error_code code; const char *addinfo = 0; @@ -742,55 +1138,64 @@ static void cmd_search(struct http_channel *c) if (!query) { error(rs, PAZPAR2_MISSING_PARAMETER, "query"); + release_session(c,s); return; } if (!utf_8_valid(query)) { error(rs, PAZPAR2_MALFORMED_PARAMETER_ENCODING, "query"); + release_session(c,s); return; } - code = search(s->psession, query, filter, &addinfo); + code = search(s->psession, query, startrecs, maxrecs, filter, &addinfo); if (code) { error(rs, code, addinfo); + release_session(c,s); return; } - rs->payload = "OK"; + rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "OK"; http_send_response(c); + 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); + if (stat.num_clients > 0) { + progress = (stat.num_clients - clients) / (float)stat.num_clients; + } + wrbuf_rewind(c->wrbuf); - wrbuf_puts(c->wrbuf, ""); + wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX ""); wrbuf_printf(c->wrbuf, "%d\n", clients); - wrbuf_printf(c->wrbuf, "%d\n", stat.num_hits); + 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_initializing); - wrbuf_printf(c->wrbuf, "%d\n", stat.num_searching); - wrbuf_printf(c->wrbuf, "%d\n", stat.num_presenting); + 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); wrbuf_puts(c->wrbuf, ""); rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); http_send_response(c); + release_session(c,s); } static void cmd_info(struct http_channel *c) @@ -799,9 +1204,13 @@ static void cmd_info(struct http_channel *c) struct http_response *rs = c->response; wrbuf_rewind(c->wrbuf); - wrbuf_puts(c->wrbuf, "\n"); + wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "\n"); wrbuf_puts(c->wrbuf, " \n"); - wrbuf_puts(c->wrbuf, ""); + wrbuf_puts(c->wrbuf, " wrbuf, " sha1=\"%s\"", PAZPAR2_VERSION_SHA1); +#endif + wrbuf_puts(c->wrbuf, ">"); wrbuf_xmlputs(c->wrbuf, VERSION); wrbuf_puts(c->wrbuf, ""); @@ -815,6 +1224,8 @@ static void cmd_info(struct http_channel *c) wrbuf_puts(c->wrbuf, " \n"); + info_services(c->server, c->wrbuf); + wrbuf_puts(c->wrbuf, ""); rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); http_send_response(c); @@ -832,6 +1243,8 @@ struct { { "search", cmd_search }, { "termlist", cmd_termlist }, { "exit", cmd_exit }, + { "session-status", cmd_session_status }, + { "server-status", cmd_server_status }, { "ping", cmd_ping }, { "record", cmd_record }, { "info", cmd_info }, @@ -840,7 +1253,7 @@ struct { 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; @@ -869,7 +1282,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 */ +