X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;ds=sidebyside;f=src%2Fhttp_command.c;h=f736b38b6af8632b54ff80ef4fa531b2a0e9e8e9;hb=ef0a61b93862f0bbb99b88f2d4460ad75509c814;hp=d6c762d706c521db967192b831fe45e1d5369b26;hpb=088f1bf8fc08ed05157a0fb166a1f10bcf253f7e;p=pazpar2-moved-to-github.git
diff --git a/src/http_command.c b/src/http_command.c
index d6c762d..f736b38 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);
}
@@ -534,7 +534,8 @@ static void termlist_response(struct http_channel *c)
static void termlist_result_ready(void *data)
{
- struct http_channel *c = (struct http_channel) data;
+ struct http_channel *c = (struct http_channel *) data;
+ yaz_log(c->http_sessions->log_level, "termlist watch released");
termlist_response(c);
}
@@ -665,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, "");
@@ -690,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(YLOG_DEBUG, "bytarget watch released");
+ yaz_log(c->http_sessions->log_level, "bytarget watch released");
bytarget_response(c);
}
@@ -940,7 +949,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);
}
@@ -1022,7 +1031,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);
}