X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fhttp_command.c;h=edaad36715ba40b25cc538feabd50d28450c3c63;hb=5bbb418c0649c0cf2b289c0899581b42c5a4385d;hp=fc292bd3c31c0284e97fc6921a6abd2bd9e47e50;hpb=93ad3268571e0b6e50620a808edbe8b4a00509a3;p=pazpar2-moved-to-github.git
diff --git a/src/http_command.c b/src/http_command.c
index fc292bd..edaad36 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -126,7 +126,7 @@ void http_sessions_destroy(http_sessions_t hs)
{
struct http_session *s_next = s->next;
iochan_destroy(s->timeout_iochan);
- destroy_session(s->psession);
+ session_destroy(s->psession);
nmem_destroy(s->nmem);
s = s_next;
}
@@ -199,7 +199,7 @@ void http_session_destroy(struct http_session *s)
{ /* 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);
+ session_destroy(s->psession);
http_session_use(-1);
nmem_destroy(s->nmem);
}
@@ -509,7 +509,7 @@ static void cmd_settings(struct http_channel *c)
release_session(c, s);
}
-static void cmd_termlist(struct http_channel *c)
+static void termlist_response(struct http_channel *c)
{
struct http_request *rq = c->request;
struct http_session *s = locate_session(c);
@@ -518,14 +518,11 @@ static void cmd_termlist(struct http_channel *c)
int num = 15;
int status;
- if (!s)
- return;
-
- status = session_active_clients(s->psession);
-
if (nums)
num = atoi(nums);
+ status = session_active_clients(s->psession);
+
response_open_no_status(c, "termlist");
wrbuf_printf(c->wrbuf, "%d\n", status);
@@ -535,6 +532,46 @@ static void cmd_termlist(struct http_channel *c)
release_session(c, s);
}
+static void termlist_result_ready(void *data)
+{
+ struct http_channel *c = (struct http_channel *) data;
+ yaz_log(c->http_sessions->log_level, "termlist watch released");
+ termlist_response(c);
+}
+
+static void cmd_termlist(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");
+ int active_clients;
+ 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
+ if (session_set_watch(s->psession, SESSION_WATCH_TERMLIST,
+ termlist_result_ready, c, c) != 0)
+ {
+ yaz_log(YLOG_WARN, "Attempt to block multiple times on termlist block. Not supported!");
+ error(rs, PAZPAR2_ALREADY_BLOCKED, "termlist");
+ }
+ else
+ {
+ yaz_log(c->http_sessions->log_level, "%p Session %u: Blocking on command termlist", s, s->session_id);
+ }
+ release_session(c, s);
+ return;
+ }
+
+ termlist_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)
@@ -629,6 +666,14 @@ static void bytarget_response(struct http_channel *c) {
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, "");
+ 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);
wrbuf_puts(c->wrbuf, "");
@@ -654,7 +699,7 @@ static void bytarget_response(struct http_channel *c) {
static void bytarget_result_ready(void *data)
{
struct http_channel *c = (struct http_channel *) data;
-
+ yaz_log(c->http_sessions->log_level, "bytarget watch released");
bytarget_response(c);
}
@@ -665,11 +710,14 @@ 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");
+ int no_active;
if (!s)
return;
- if (block && !strcmp("1",block))
+ 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,
@@ -840,7 +888,8 @@ static void cmd_record(struct http_channel *c)
int i;
struct record*r = rec->records;
int binary = 0;
-
+ const char *nativesyntax = http_argbyname(rq, "nativesyntax");
+
if (binarystr && *binarystr != '0')
binary = 1;
@@ -855,13 +904,14 @@ static void cmd_record(struct http_channel *c)
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),
- (binary ? 1 : 0));
+ 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);
@@ -901,7 +951,7 @@ static void cmd_record(struct http_channel *c)
static void cmd_record_ready(void *data)
{
struct http_channel *c = (struct http_channel *) data;
-
+ yaz_log(c->http_sessions->log_level, "record watch released");
cmd_record(c);
}
@@ -983,7 +1033,7 @@ static void show_records(struct http_channel *c, int active)
static void show_records_ready(void *data)
{
struct http_channel *c = (struct http_channel *) data;
-
+ yaz_log(c->http_sessions->log_level, "show watch released");
show_records(c, -1);
}
@@ -1037,7 +1087,8 @@ static void cmd_show(struct http_channel *c)
{
// 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");