From 706b2845d11186d2c3da0cee1240a8792c584a36 Mon Sep 17 00:00:00 2001 From: Dennis Schafroth Date: Tue, 6 Mar 2012 12:11:55 +0100 Subject: [PATCH] Only use newer protocol if triggered by parameter. --- src/http_command.c | 107 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 84 insertions(+), 23 deletions(-) diff --git a/src/http_command.c b/src/http_command.c index 854de13..10eb267 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -510,7 +510,7 @@ static void cmd_settings(struct http_channel *c) release_session(c, s); } -static void termlist_response(struct http_channel *c, struct http_session *s) +static void termlist_response(struct http_channel *c, struct http_session *s, const char *cmd_status) { struct http_request *rq = c->request; const char *name = http_argbyname(rq, "name"); @@ -524,6 +524,10 @@ static void termlist_response(struct http_channel *c, struct http_session *s) status = session_active_clients(s->psession); response_open_no_status(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); perform_termlist(c, s->psession, name, num); @@ -534,10 +538,15 @@ static void termlist_response(struct http_channel *c, struct http_session *s) 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; + if (report && !strcmp("status", report)) + status = "OK"; struct http_session *s = locate_session(c); if (s) { yaz_log(c->http_sessions->log_level, "Session %u termlist watch released", s->session_id); - termlist_response(c, s); + termlist_response(c, s, status); release_session(c,s); } } @@ -548,12 +557,23 @@ static void cmd_termlist(struct http_channel *c) 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; 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; 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 @@ -561,17 +581,24 @@ static void cmd_termlist(struct http_channel *c) termlist_result_ready, c, c) != 0) { yaz_log(YLOG_WARN, "Session %u: Attempt to block multiple times on termlist block. Not supported!", s->session_id); - error(rs, PAZPAR2_ALREADY_BLOCKED, "termlist"); + if (report_error) { + error(rs, PAZPAR2_ALREADY_BLOCKED, "termlist"); + release_session(c, s); + return; + } + if (report_status) { + status_message = "WARNING (Already blocked on termlist)"; + } } else { yaz_log(c->http_sessions->log_level, "Session %u: Blocking on command termlist", s->session_id); + release_session(c, s); + return; } - release_session(c, s); - return; } - termlist_response(c, s); + termlist_response(c, s, status_message); release_session(c, s); } @@ -641,14 +668,22 @@ static void cmd_server_status(struct http_channel *c) xmalloc_trav(0); } -static void bytarget_response(struct http_channel *c, struct http_session *s) { +static void bytarget_response(struct http_channel *c, struct http_session *s, const char *cmd_status) { int count, i; struct hitsbytarget *ht; struct http_request *rq = c->request; const char *settings = http_argbyname(rq, "settings"); ht = get_hitsbytarget(s->psession, &count, c->nmem); - response_open(c, "bytarget"); + if (!cmd_status) + /* Old protocol, always ok */ + response_open(c, "bytarget"); + else { + /* New protocol, OK or WARNING (...)*/ + response_open_no_status(c, "bytarget"); + wrbuf_printf(c->wrbuf, "%s\n", cmd_status); + } + if (count == 0) yaz_log(YLOG_WARN, "Empty bytarget Response. No targets found!"); for (i = 0; i < count; i++) @@ -701,9 +736,10 @@ 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) { yaz_log(c->http_sessions->log_level, "Session %u: bytarget watch released", s->session_id); - bytarget_response(c, s); + bytarget_response(c, s, status_message); release_session(c, s); } else { @@ -718,13 +754,23 @@ static void cmd_bytarget(struct http_channel *c) 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 block_error = 0; + int report_status = 0; + const char *status_message = "OK"; + if (report && !strcmp("error", report)) { + block_error = 1; + } + if (report && !strcmp("status", report)) { + report_status = 1; + } + int no_active; 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 @@ -732,16 +778,23 @@ static void cmd_bytarget(struct http_channel *c) bytarget_result_ready, c, c) != 0) { yaz_log(YLOG_WARN, "Session %u: Attempt to block multiple times on bytarget block. Not supported!", s->session_id); - error(rs, PAZPAR2_ALREADY_BLOCKED, "bytarget"); + if (block_error) { + error(rs, PAZPAR2_ALREADY_BLOCKED, "bytarget"); + release_session(c, s); + return; + } + if (report_status) { + status_message = "WARNING (Already blocked on bytarget)"; + } } else { yaz_log(c->http_sessions->log_level, "Session %u: Blocking on command bytarget", s->session_id); + release_session(c, s); + return; } - release_session(c, s); - return; } - bytarget_response(c, s); + bytarget_response(c, s, status_message); release_session(c, s); } @@ -1067,6 +1120,7 @@ static void cmd_show(struct http_channel *c) 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, "error"); struct reclist_sortparms *sp; int status; @@ -1096,32 +1150,39 @@ static void cmd_show(struct http_channel *c) { yaz_log(c->http_sessions->log_level, "Session %u: Blocking on command show (preferred targets)", s->session_id); + release_session(c, s); + return; } else { yaz_log(YLOG_WARN, "Attempt to block multiple times on show (preferred targets) block. Not supported!"); - error(rs, PAZPAR2_ALREADY_BLOCKED, "show (preferred targets)"); + if (block_error && !strcmp("1", block_error)) { + error(rs, PAZPAR2_ALREADY_BLOCKED, "show (preferred targets)"); + release_session(c, s); + return; + } } - release_session(c, s); - return; } 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 - ) + show_records_ready, c, c) != 0) { yaz_log(YLOG_WARN, "Attempt to block multiple times on show block. Not supported!"); - error(rs, PAZPAR2_ALREADY_BLOCKED, "show"); + if (block_error && !strcmp("1", block_error)) { + error(rs, PAZPAR2_ALREADY_BLOCKED, "show"); + release_session(c, s); + return; + } } else { yaz_log(c->http_sessions->log_level, "Session %u: Blocking on command show", s->session_id); + release_session(c, s); + return; } - release_session(c, s); - return; } } show_records(c, s, status); -- 1.7.10.4