X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=f109e16e71e61b449f416d2dec46ee37b43caa85;hb=33f6cb2ff7f0e57bb8001d40b1a7400e3f8ebc61;hp=bbd6b83c0949e7837b284658cedffd107a161ffb;hpb=2132ceb662c8c40046a7cea4549d173025b53981;p=pazpar2-moved-to-github.git

diff --git a/src/http_command.c b/src/http_command.c
index bbd6b83..f109e16 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2011 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
@@ -44,21 +44,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifdef HAVE_MALLINFO
 #include <malloc.h>
 
-void print_meminfo(WRBUF wrbuf) {
-
+void print_meminfo(WRBUF wrbuf)
+{
     struct mallinfo minfo;
     minfo = mallinfo();
     wrbuf_printf(wrbuf, "  <memory>\n"
-                        "   <arena>%d</arena>\n" 
+                        "   <arena>%d</arena>\n"
                         "   <uordblks>%d</uordblks>\n"
                         "   <fordblks>%d</fordblks>\n"
                         "   <ordblks>%d</ordblks>\n"
                         "   <keepcost>%d</keepcost>\n"
-                        "   <hblks>%d</hblks>\n" 
+                        "   <hblks>%d</hblks>\n"
                         "   <hblkhd>%d</hblkhd>\n"
                         "   <virt>%d</virt>\n"
                         "   <virtuse>%d</virtuse>\n"
-                        "  </memory>\n", 
+                        "  </memory>\n",
                  minfo.arena, minfo.uordblks, minfo.fordblks,minfo.ordblks, minfo.keepcost, minfo.hblks, minfo.hblkhd, minfo.arena + minfo.hblkhd, minfo.uordblks + minfo.hblkhd);
 
 }
@@ -93,6 +93,18 @@ struct http_sessions {
 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;
@@ -102,7 +114,8 @@ int http_session_use(int delta)
     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);
+    yaz_log(YLOG_DEBUG, "%s http_sessions=%d", delta == 0 ? "" :
+            (delta > 0 ? "INC" : "DEC"), sessions);
     return sessions;
 
 }
@@ -113,7 +126,7 @@ http_sessions_t http_sessions_create(void)
     hs->session_list = 0;
     hs->mutex = 0;
     pazpar2_mutex_create(&hs->mutex, "http_sessions");
-    hs->log_level = yaz_log_module_level("HTTP");
+    hs->log_level = yaz_log_module_level("http");
     return hs;
 }
 
@@ -126,7 +139,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;
         }
@@ -164,9 +177,13 @@ struct http_session *http_session_create(struct conf_service *service,
     http_sessions->session_list = r;
     yaz_mutex_leave(http_sessions->mutex);
 
-    r->timeout_iochan = iochan_create(-1, session_timeout, 0, "http_session_timeout");
+    r->timeout_iochan = iochan_create(-1, session_timeout, 0,
+                                      "http_session_timeout");
     iochan_setdata(r->timeout_iochan, r);
-    yaz_log(http_sessions->log_level, "%p Session %u created. timeout chan=%p timeout=%d", r, sesid, r->timeout_iochan, service->session_timeout);
+
+    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);
@@ -180,10 +197,12 @@ void http_session_destroy(struct http_session *s)
 
     http_sessions_t http_sessions = s->http_sessions;
 
-    yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed", s, s->session_id);
+    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) {
+    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)
@@ -196,15 +215,17 @@ void http_session_destroy(struct http_session *s)
     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);
+        session_log(s->psession, http_sessions->log_level, "About to destroyd");
         iochan_destroy(s->timeout_iochan);
-        destroy_session(s->psession);
+        session_destroy(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);
+    else
+    {
+        session_log(s->psession, http_sessions->log_level,
+                    "Destroy delayed. Active clients (%d-%d)",
+                    s->activity_counter, s->destroy_counter);
     }
 
 }
@@ -228,6 +249,7 @@ static const char *get_msg(enum pazpar2_error_code code)
         { 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 }
     };
@@ -241,22 +263,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, HTTP_COMMAND_RESPONSE_PREFIX "<error code=\"%d\" msg=\"%s\">", (int) code,
-               msg);
+    wrbuf_printf(text, HTTP_COMMAND_RESPONSE_PREFIX
+                 "<error code=\"%d\" msg=\"%s\">", (int) code, msg);
     if (addinfo)
+    {
         wrbuf_xmlputs(text, addinfo);
+        if (addinfo2)
+        {
+            wrbuf_xmlputs(text, ": ");
+            wrbuf_xmlputs(text, addinfo2);
+        }
+    }
     wrbuf_puts(text, "</error>");
 
     yaz_log(YLOG_WARN, "HTTP %s %s%s%s", http_status,
@@ -266,6 +295,37 @@ static void error(struct http_response *rs,
     http_send_response(c);
 }
 
+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, "<status>OK</status>");
+}
+
+static void response_close(struct http_channel *c, const char *command)
+{
+    struct http_response *rs = c->response;
+
+    if (command)
+        wrbuf_printf(c->wrbuf, "</%s>", command);
+    rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
+    http_send_response(c);
+}
+
 unsigned int make_sessionid(void)
 {
     static int seq = 0; /* thread pr */
@@ -286,7 +346,7 @@ unsigned int make_sessionid(void)
             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);
@@ -297,8 +357,8 @@ unsigned int make_sessionid(void)
 
 static struct http_session *locate_session(struct http_channel *c)
 {
-    struct http_response *rs = c->response;
     struct http_request *rq = c->request;
+    struct http_response *rs = c->response;
     struct http_session *p;
     const char *session = http_argbyname(rq, "session");
     http_sessions_t http_sessions = c->http_sessions;
@@ -325,7 +385,9 @@ static struct http_session *locate_session(struct http_channel *c)
 }
 
 // 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) {
+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)
@@ -339,6 +401,7 @@ static int process_settings(struct session *se, struct http_request *rq,
                             struct http_response *rs)
 {
     struct http_argument *a;
+    NMEM nmem = nmem_create();
 
     for (a = rq->arguments; a; a = a->next)
         if (strchr(a->name, '['))
@@ -349,34 +412,33 @@ 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)
 {
-    char buf[1024];
-    struct http_response *rs = c->response;
     yaz_log(YLOG_WARN, "exit");
-    sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX "<exit><status>OK</status></exit>");
-    rs->payload = nmem_strdup(c->nmem, buf);
-    http_send_response(c);
-    http_close_server(c->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)
 {
-    char buf[1024];
     struct http_request *r = c->request;
     const char *clear = http_argbyname(r, "clear");
     const char *content_type = http_lookup_header(r->headers, "Content-Type");
@@ -384,8 +446,8 @@ static void cmd_init(struct http_channel *c)
     struct http_session *s;
     struct http_response *rs = c->response;
     struct conf_service *service = 0; /* no service (yet) */
-    
-    if (r->content_len && content_type && 
+
+    if (r->content_len && content_type &&
         !yaz_strcmp_del("text/xml", content_type, "; "))
     {
         xmlDoc *doc = xmlParseMemory(r->content_buf, r->content_len);
@@ -404,7 +466,7 @@ static void cmd_init(struct http_channel *c)
             return;
         }
     }
-    
+
     if (!service)
     {
         const char *service_name = http_argbyname(c->request, "service");
@@ -417,27 +479,29 @@ static void cmd_init(struct http_channel *c)
     }
     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, "HTTP Session %u init: No databases preloaded", sesid);
-    
+        session_log(s->psession, YLOG_LOG, "No databases preloaded");
+
     if (process_settings(s->psession, c->request, c->response) < 0)
         return;
-    
-    sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX 
-            "<init><status>OK</status><session>%d", sesid);
+
+    response_open_ok(c, "init");
+    wrbuf_printf(c->wrbuf, "<session>%d", sesid);
     if (c->server->server_id)
     {
-        strcat(buf, ".");
-        strcat(buf, c->server->server_id);
+        wrbuf_puts(c->wrbuf, ".");
+        wrbuf_puts(c->wrbuf, c->server->server_id);
     }
-    strcat(buf, "</session>"
-           "<protocol>" PAZPAR2_PROTOCOL_VERSION "</protocol></init>");
-    rs->payload = nmem_strdup(c->nmem, buf);
-    http_send_response(c);
+    wrbuf_puts(c->wrbuf, "</session>"
+               "<protocol>" PAZPAR2_PROTOCOL_VERSION "</protocol>");
+
+    wrbuf_printf(c->wrbuf, "<keepAlive>%d</keepAlive>\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,
@@ -445,9 +509,7 @@ static void apply_local_setting(void *client_data,
 {
     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));
+    session_apply_setting(se, set->target, set->name, set->value);
 }
 
 static void cmd_settings(struct http_channel *c)
@@ -460,160 +522,138 @@ static void cmd_settings(struct http_channel *c)
     if (!s)
         return;
 
-    if (rq->content_len && content_type && 
+    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);
-
-        settings_read_node_x(root_n, s->psession, apply_local_setting);
-
+        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);
+    if (process_settings(s->psession, rq, rs) < 0)
+    {
+        release_session(c, s);
         return;
     }
-    rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "<settings><status>OK</status></settings>";
-    http_send_response(c);
-    release_session(c,s);
+    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;
+
+    if (nums)
+        num = atoi(nums);
+
+    status = session_active_clients(s->psession);
+
+    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, "<status>%s</status>\n", cmd_status);
+    wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", status);
+
+    perform_termlist(c, s->psession, name, num, version);
+
+    response_close(c, "termlist");
 }
 
-// This implements functionality somewhat similar to 'bytarget', but in a termlist form
-static int targets_termlist(WRBUF wrbuf, struct session *se, int num,
-                             NMEM nmem)
+static void termlist_result_ready(void *data)
 {
-    struct hitsbytarget *ht;
-    int count, i;
-
-    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++)
+    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)
     {
-
-        // do only print terms which have display names
-    
-        wrbuf_puts(wrbuf, "<term>\n");
-
-        wrbuf_puts(wrbuf, "<id>");
-        wrbuf_xmlputs(wrbuf, ht[i].id);
-        wrbuf_puts(wrbuf, "</id>\n");
-        
-        wrbuf_puts(wrbuf, "<name>");
-        if (!ht[i].name || !ht[i].name[0])
-            wrbuf_xmlputs(wrbuf, "NO TARGET NAME");
-        else
-            wrbuf_xmlputs(wrbuf, ht[i].name);
-        wrbuf_puts(wrbuf, "</name>\n");
-        
-        wrbuf_printf(wrbuf, "<frequency>" ODR_INT_PRINTF "</frequency>\n",
-                     ht[i].hits);
-        
-        wrbuf_puts(wrbuf, "<state>");
-        wrbuf_xmlputs(wrbuf, ht[i].state);
-        wrbuf_puts(wrbuf, "</state>\n");
-        
-        wrbuf_printf(wrbuf, "<diagnostic>%d</diagnostic>\n", 
-                     ht[i].diagnostic);
-        wrbuf_puts(wrbuf, "</term>\n");
+        session_log(s->psession, c->http_sessions->log_level,
+                    "termlist watch released");
+        termlist_response(c, s, status);
+        release_session(c, s);
     }
-    return count;
 }
 
 static void cmd_termlist(struct http_channel *c)
 {
-    struct http_response *rs = c->response;
     struct http_request *rq = c->request;
+    struct http_response *rs = c->response;
     struct http_session *s = locate_session(c);
-    const char *name = http_argbyname(rq, "name");
-    const char *nums = http_argbyname(rq, "num");
-    int num = 15;
-    int status;
-    WRBUF debug_log = wrbuf_alloc();
+    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);
-
-    if (!name)
-        name = "subject";
-    if (strlen(name) > 255)
-        return;
-    if (nums)
-        num = atoi(nums);
-
-    wrbuf_rewind(c->wrbuf);
-
-    wrbuf_puts(c->wrbuf, "<termlist>\n");
-    wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", status);
-    while (*name)
+    active_clients = session_active_clients(s->psession);
+    if (block && !strcmp("1", block) && active_clients)
     {
-        char tname[256];
-        const char *tp;
-
-        if (!(tp = strchr(name, ',')))
-            tp = name + strlen(name);
-        strncpy(tname, name, tp - name);
-        tname[tp - name] = '\0';
-        wrbuf_puts(c->wrbuf, "<list name=\"");
-        wrbuf_xmlputs(c->wrbuf, tname);
-        wrbuf_puts(c->wrbuf, "\">\n");
-        if (!strcmp(tname, "xtargets")) {
-            int targets = targets_termlist(c->wrbuf, s->psession, num, c->nmem);
-            wrbuf_printf(debug_log, " xtargets: %d", targets);
+        // 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
         {
-            int len;
-            struct termlist_score **p = 
-                get_termlist_score(s->psession, tname, &len);
-            if (p && len)
-                wrbuf_printf(debug_log, " %s: %d", tname, len);
-            if (p) {
-                int i;
-                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, "<term>");
-                    wrbuf_puts(c->wrbuf, "<name>");
-                    wrbuf_xmlputs(c->wrbuf, p[i]->term);
-                    wrbuf_puts(c->wrbuf, "</name>");
-                    
-                    wrbuf_printf(c->wrbuf, 
-                                 "<frequency>%d</frequency>", 
-                                 p[i]->frequency);
-                    wrbuf_puts(c->wrbuf, "</term>\n");
-               }
-            }
+            session_log(s->psession, c->http_sessions->log_level,
+                        "Blocking on command termlist");
+            release_session(c, s);
+            return;
         }
-        wrbuf_puts(c->wrbuf, "</list>\n");
-        name = tp;
-        if (*name == ',')
-            name++;
     }
-    wrbuf_puts(c->wrbuf, "</termlist>\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);
+
+    termlist_response(c, s, status_message);
+    release_session(c, s);
 }
 
 size_t session_get_memory_status(struct session *session);
@@ -621,30 +661,39 @@ 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, "<http_count>%u</http_count>\n", s->activity_counter);
-    wrbuf_printf(c->wrbuf, "<http_nmem>%zu</http_nmem>\n", nmem_total(s->nmem) );
+    wrbuf_printf(c->wrbuf, "<http_count>%u</http_count>\n",
+                 s->activity_counter);
+    wrbuf_printf(c->wrbuf, "<http_nmem>%zu</http_nmem>\n",
+                 nmem_total(s->nmem) );
     session_nmem = session_get_memory_status(s->psession);
     wrbuf_printf(c->wrbuf, "<session_nmem>%zu</session_nmem>\n", session_nmem);
 }
 
-static void cmd_session_status(struct http_channel *c) {
-    struct http_response *rs = c->response;
+static void cmd_service(struct http_channel *c)
+{
     struct http_session *s = locate_session(c);
     if (!s)
         return;
 
-    wrbuf_rewind(c->wrbuf);
-    wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<sessionstatus><status>OK</status>\n");
-    session_status(c, s);
-    wrbuf_puts(c->wrbuf, "</sessionstatus>\n");
-    rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
-    http_send_response(c);
-    release_session(c,s);
+    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);
 }
 
-int sessions_count(void);
-int clients_count(void);
 #ifdef HAVE_RESULTSETS_COUNT
 int resultsets_count(void);
 #else
@@ -653,13 +702,12 @@ int resultsets_count(void);
 
 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 "<server-status>\n");
-    wrbuf_printf(c->wrbuf, "  <sessions>%u</sessions>\n", sessions);
+
+    response_open_ok(c, "server-status");
+    wrbuf_printf(c->wrbuf, "\n  <sessions>%u</sessions>\n", sessions);
     wrbuf_printf(c->wrbuf, "  <clients>%u</clients>\n",   clients);
     /* Only works if yaz has been compiled with enabling of this */
     wrbuf_printf(c->wrbuf, "  <resultsets>%u</resultsets>\n",resultsets);
@@ -670,7 +718,8 @@ static void cmd_server_status(struct http_channel *c)
 /*    struct http_session *p;                           */
 /*
     yaz_mutex_enter(http_sessions->mutex);
-    for (p = http_sessions->session_list; p; p = p->next) {
+    for (p = http_sessions->session_list; p; p = p->next)
+    {
         p->activity_counter++;
         wrbuf_puts(c->wrbuf, "<session-status>\n");
         wrbuf_printf(c->wrbuf, "<id>%s</id>\n", p->session_id);
@@ -682,28 +731,32 @@ static void cmd_server_status(struct http_channel *c)
     }
     yaz_mutex_leave(http_sessions->mutex);
 */
-    wrbuf_puts(c->wrbuf, "</server-status>\n");
-    rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
-    http_send_response(c);
+    response_close(c, "server-status");
     xmalloc_trav(0);
 }
 
-
-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;
+    int count, i;
     struct http_request *rq = c->request;
-    struct http_session *s = locate_session(c);
-    struct hitsbytarget *ht;
     const char *settings = http_argbyname(rq, "settings");
-    int count, i;
+    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, HTTP_COMMAND_RESPONSE_PREFIX "<bytarget><status>OK</status>");
+    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, "<status>%s</status>", 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<target>");
@@ -712,7 +765,7 @@ static void cmd_bytarget(struct http_channel *c)
         wrbuf_xmlputs(c->wrbuf, ht[i].id);
         wrbuf_puts(c->wrbuf, "</id>\n");
 
-        if (ht[i].name && ht[i].name[0]) 
+        if (ht[i].name && ht[i].name[0])
         {
             wrbuf_puts(c->wrbuf, "<name>");
             wrbuf_xmlputs(c->wrbuf, ht[i].name);
@@ -720,9 +773,27 @@ static void cmd_bytarget(struct http_channel *c)
         }
 
         wrbuf_printf(c->wrbuf, "<hits>" ODR_INT_PRINTF "</hits>\n", ht[i].hits);
-        wrbuf_printf(c->wrbuf, "<diagnostic>%d</diagnostic>\n", ht[i].diagnostic);
-        wrbuf_printf(c->wrbuf, "<records>%d</records>\n", ht[i].records);
+        wrbuf_printf(c->wrbuf, "<diagnostic>%d</diagnostic>\n",
+                     ht[i].diagnostic);
+        if (ht[i].diagnostic)
+        {
+            wrbuf_puts(c->wrbuf, "<message>");
+            wrbuf_xmlputs(c->wrbuf, ht[i].message);
+            wrbuf_puts(c->wrbuf, "</message>\n");
+            wrbuf_puts(c->wrbuf, "<addinfo>");
+            if (ht[i].addinfo)
+                wrbuf_xmlputs(c->wrbuf, ht[i].addinfo);
+            wrbuf_puts(c->wrbuf, "</addinfo>\n");
+        }
 
+        wrbuf_printf(c->wrbuf, "<records>%d</records>\n",
+                     ht[i].records - ht[i].filtered);
+        wrbuf_printf(c->wrbuf, "<filtered>%d</filtered>\n", ht[i].filtered);
+        if (version >= 2)
+        {
+            wrbuf_printf(c->wrbuf, "<approximation>" ODR_INT_PRINTF
+                         "</approximation>\n", ht[i].approximation);
+        }
         wrbuf_puts(c->wrbuf, "<state>");
         wrbuf_xmlputs(c->wrbuf, ht[i].state);
         wrbuf_puts(c->wrbuf, "</state>\n");
@@ -732,17 +803,100 @@ static void cmd_bytarget(struct http_channel *c)
             wrbuf_puts(c->wrbuf, ht[i].settings_xml);
             wrbuf_puts(c->wrbuf, "</settings>\n");
         }
+        if (ht[i].suggestions_xml && ht[i].suggestions_xml[0])
+        {
+            wrbuf_puts(c->wrbuf, "<suggestions>");
+            wrbuf_puts(c->wrbuf, ht[i].suggestions_xml);
+            wrbuf_puts(c->wrbuf, "</suggestions>");
+        }
+        if (ht[i].query_data)
+        {
+            wrbuf_puts(c->wrbuf, "<query_type>");
+            wrbuf_xmlputs(c->wrbuf, ht[i].query_type);
+            wrbuf_puts(c->wrbuf, "</query_type>\n");
+            wrbuf_puts(c->wrbuf, "<query_data>");
+            wrbuf_xmlputs(c->wrbuf, ht[i].query_data);
+            wrbuf_puts(c->wrbuf, "</query_data>\n");
+        }
         wrbuf_puts(c->wrbuf, "</target>");
     }
+    response_close(c, "bytarget");
+}
 
-    wrbuf_puts(c->wrbuf, "</bytarget>");
-    rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
-    http_send_response(c);
-    release_session(c,s);
+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;
 
@@ -750,12 +904,15 @@ 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)
         {
             struct record_metadata_attr *attr = md->attributes;
-            wrbuf_printf(w, "\n<md-%s", cmd->name);
+            int i;
+            for (i = 0; i < indent; i++)
+                wrbuf_putc(w, ' ');
+            wrbuf_printf(w, "<md-%s", cmd->name);
 
             for (; attr; attr = attr->next)
             {
@@ -767,37 +924,49 @@ static void write_metadata(WRBUF w, struct conf_service *service,
             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, "</md-%s>", cmd->name);
+            wrbuf_printf(w, "</md-%s>\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, "<location id=\"");
-    wrbuf_xmlputs(w, client_get_database(r->client)->database->url);
-    wrbuf_puts(w, "\" ");
+    wrbuf_puts(w, " <location id=\"");
+    wrbuf_xmlputs(w, client_get_id(r->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, "\" ");
 
-    write_metadata(w, service, r->metadata, show_details);
-    wrbuf_puts(w, "</location>\n");
+    wrbuf_puts(w, "checksum=\"");
+    wrbuf_printf(w,  "%u", r->checksum);
+    wrbuf_puts(w, "\">\n");
+
+    write_metadata(w, service, r->metadata, flags, indent);
+    wrbuf_puts(w, " </location>\n");
 }
 
 static void show_raw_record_error(void *data, const char *addinfo)
@@ -849,18 +1018,19 @@ 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(c);
     struct record_cluster *rec, *prev_r, *next_r;
-    struct record *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;
@@ -881,39 +1051,50 @@ static void cmd_record(struct http_channel *c)
         {
             error(rs, PAZPAR2_RECORD_MISSING, idstr);
         }
-        release_session(c, s);
         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");
+            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
         {
+            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),
-                                        (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);
@@ -923,58 +1104,78 @@ static void cmd_record(struct http_channel *c)
     }
     else
     {
-        wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<record>\n");
-        wrbuf_puts(c->wrbuf, "<recid>");
+        struct record *r;
+        response_open_command(c, "record");
+        wrbuf_puts(c->wrbuf, "\n <recid>");
         wrbuf_xmlputs(c->wrbuf, rec->recid);
         wrbuf_puts(c->wrbuf, "</recid>\n");
         if (prev_r)
         {
-            wrbuf_puts(c->wrbuf, "<prevrecid>");
+            wrbuf_puts(c->wrbuf, " <prevrecid>");
             wrbuf_xmlputs(c->wrbuf, prev_r->recid);
             wrbuf_puts(c->wrbuf, "</prevrecid>\n");
         }
         if (next_r)
         {
-            wrbuf_puts(c->wrbuf, "<nextrecid>");
+            wrbuf_puts(c->wrbuf, " <nextrecid>");
             wrbuf_xmlputs(c->wrbuf, next_r->recid);
             wrbuf_puts(c->wrbuf, "</nextrecid>\n");
         }
-        wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", 
+        wrbuf_printf(c->wrbuf, " <activeclients>%d</activeclients>\n",
                      session_active_clients(s->psession));
-        write_metadata(c->wrbuf, service, rec->metadata, 1);
+        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, "</record>\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);
-    release_session(c, s);
 }
 
 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(c);
     struct record_cluster **rl;
     struct reclist_sortparms *sp;
     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;
     Odr_int total_hits;
+    Odr_int approx_hits;
     int i;
-
+    struct conf_service *service = 0;
     if (!s)
         return;
 
@@ -986,23 +1187,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, s->psession->service)))
+        sort = service->default_sort;
+    if (!(sp = reclist_parse_sortparms(c->nmem, sort, service)))
     {
         error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
-        release_session(c, s);
         return;
+
     }
 
-    
-    rl = show_range_start(s->psession, sp, startn, &numn, &total, &total_hits);
+    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, HTTP_COMMAND_RESPONSE_PREFIX "<show>\n<status>OK</status>\n");
-    wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", active);
+    response_open_ok(c, "show");
+    wrbuf_printf(c->wrbuf, "\n<activeclients>%d</activeclients>\n", active);
     wrbuf_printf(c->wrbuf, "<merged>%d</merged>\n", total);
     wrbuf_printf(c->wrbuf, "<total>" ODR_INT_PRINTF "</total>\n", total_hits);
+    if (version >= 2)
+        wrbuf_printf(c->wrbuf, "<approximation>" ODR_INT_PRINTF
+                     "</approximation>\n", approx_hits);
+
     wrbuf_printf(c->wrbuf, "<start>%d</start>\n", startn);
     wrbuf_printf(c->wrbuf, "<num>%d</num>\n", numn);
 
@@ -1014,15 +1222,23 @@ static void show_records(struct http_channel *c, int active)
         struct conf_service *service = s->psession->service;
 
         wrbuf_puts(c->wrbuf, "<hit>\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, "<count>%d</count>\n", ccount);
+            write_subrecord(p, c->wrbuf, service, flags, 2);
+        wrbuf_printf(c->wrbuf, " <count>%d</count>\n", ccount);
 	if (strstr(sort, "relevance"))
-	    wrbuf_printf(c->wrbuf, "<relevance>%d</relevance>\n",
+        {
+	    wrbuf_printf(c->wrbuf, " <relevance>%d</relevance>\n",
                          rec->relevance_score);
-        wrbuf_puts(c->wrbuf, "<recid>");
+            if (service->rank_debug)
+            {
+                wrbuf_printf(c->wrbuf, " <relevance_info>\n");
+                wrbuf_xmlputs(c->wrbuf, wrbuf_cstr(rec->relevance_explain1));
+                wrbuf_xmlputs(c->wrbuf, wrbuf_cstr(rec->relevance_explain2));
+                wrbuf_printf(c->wrbuf, " </relevance_info>\n");
+            }
+        }
+        wrbuf_puts(c->wrbuf, " <recid>");
         wrbuf_xmlputs(c->wrbuf, rec->recid);
         wrbuf_puts(c->wrbuf, "</recid>\n");
         wrbuf_puts(c->wrbuf, "</hit>\n");
@@ -1030,69 +1246,129 @@ static void show_records(struct http_channel *c, int active)
 
     show_range_stop(s->psession, rl);
 
-    wrbuf_puts(c->wrbuf, "</show>\n");
-    rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
-    http_send_response(c);
-    release_session(c, s);
+    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(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 (!strcmp(block, "preferred") && !session_is_preferred_clients_ready(s->psession) && reclist_get_num_records(s->psession->reclist) == 0) {
+        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)
+                                  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);
+                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");
             }
-            release_session(c,s);
-            return;
 
         }
-        else if (status && reclist_get_num_records(s->psession->reclist) == 0)
+        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(c->http_sessions->log_level, "%p Session %u: Blocking on cmd_show", s, s->session_id);
+                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;
             }
-            release_session(c,s);
-            return;
         }
     }
-    show_records(c, status);
-    release_session(c,s);
+    show_records(c, s, status);
+    release_session(c, s);
 }
 
 static void cmd_ping(struct http_channel *c)
 {
-    struct http_response *rs = c->response;
     struct http_session *s = locate_session(c);
     if (!s)
         return;
-    rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "<ping><status>OK</status></ping>";
-    http_send_response(c);
+    response_open_ok(c, "ping");
+    response_close(c, "ping");
     release_session(c, s);
 }
 
@@ -1105,39 +1381,58 @@ static void cmd_search(struct http_channel *c)
     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);
+        release_session(c, s);
         return;
     }
     if (!yaz_utf8_check(query))
     {
         error(rs, PAZPAR2_MALFORMED_PARAMETER_ENCODING, "query");
-        release_session(c,s);
+        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, startrecs, maxrecs, filter, &addinfo);
+
+    code = session_search(s->psession, query, startrecs, maxrecs, filter, limit,
+                          &addinfo, &addinfo2, sp, mergekey, rank);
     if (code)
     {
-        error(rs, code, addinfo);
-        release_session(c,s);
+        error2(rs, code, addinfo, addinfo2);
+        release_session(c, s);
         return;
     }
-    rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "<search><status>OK</status></search>";
-    http_send_response(c);
-    release_session(c,s);
+    response_open_ok(c, "search");
+    response_close(c, "search");
+    release_session(c, s);
 }
 
 
 static void cmd_stat(struct http_channel *c)
 {
-    struct http_response *rs = c->response;
     struct http_session *s = locate_session(c);
     struct statistics stat;
     int clients;
@@ -1150,60 +1445,77 @@ static void cmd_stat(struct http_channel *c)
     clients = session_active_clients(s->psession);
     statistics(s->psession, &stat);
 
-    if (stat.num_clients > 0) {
+    if (stat.num_clients > 0)
+    {
     	progress = (stat.num_clients  - clients) / (float)stat.num_clients;
     }
 
-    wrbuf_rewind(c->wrbuf);
-    wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<stat>");
-    wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", clients);
-    wrbuf_printf(c->wrbuf, "<hits>" ODR_INT_PRINTF "</hits>\n", stat.num_hits);
-    wrbuf_printf(c->wrbuf, "<records>%d</records>\n", stat.num_records);
-    wrbuf_printf(c->wrbuf, "<clients>%d</clients>\n", stat.num_clients);
-    wrbuf_printf(c->wrbuf, "<unconnected>%d</unconnected>\n", stat.num_no_connection);
-    wrbuf_printf(c->wrbuf, "<connecting>%d</connecting>\n", stat.num_connecting);
-    wrbuf_printf(c->wrbuf, "<working>%d</working>\n", stat.num_working);
-    wrbuf_printf(c->wrbuf, "<idle>%d</idle>\n", stat.num_idle);
-    wrbuf_printf(c->wrbuf, "<failed>%d</failed>\n", stat.num_failed);
-    wrbuf_printf(c->wrbuf, "<error>%d</error>\n", stat.num_error);
-    wrbuf_printf(c->wrbuf, "<progress>%.2f</progress>\n", progress);
-    wrbuf_puts(c->wrbuf, "</stat>");
-    rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
-    http_send_response(c);
-    release_session(c,s);
+    response_open_command(c, "stat");
+    wrbuf_printf(c->wrbuf, "\n <activeclients>%d</activeclients>\n", clients);
+    wrbuf_printf(c->wrbuf, " <hits>" ODR_INT_PRINTF "</hits>\n", stat.num_hits);
+    wrbuf_printf(c->wrbuf, " <records>%d</records>\n", stat.num_records);
+    wrbuf_printf(c->wrbuf, " <clients>%d</clients>\n", stat.num_clients);
+    wrbuf_printf(c->wrbuf, " <unconnected>%d</unconnected>\n", stat.num_no_connection);
+    wrbuf_printf(c->wrbuf, " <connecting>%d</connecting>\n", stat.num_connecting);
+    wrbuf_printf(c->wrbuf, " <working>%d</working>\n", stat.num_working);
+    wrbuf_printf(c->wrbuf, " <idle>%d</idle>\n", stat.num_idle);
+    wrbuf_printf(c->wrbuf, " <failed>%d</failed>\n", stat.num_failed);
+    wrbuf_printf(c->wrbuf, " <error>%d</error>\n", stat.num_error);
+    wrbuf_printf(c->wrbuf, " <progress>%.2f</progress>\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, HTTP_COMMAND_RESPONSE_PREFIX "<info>\n");
-    wrbuf_puts(c->wrbuf, " <version>\n");
+    response_open_command(c, "info");
+    wrbuf_puts(c->wrbuf, "\n <version>\n");
     wrbuf_puts(c->wrbuf, "  <pazpar2");
 #ifdef PAZPAR2_VERSION_SHA1
     wrbuf_printf(c->wrbuf, " sha1=\"%s\"", PAZPAR2_VERSION_SHA1);
 #endif
     wrbuf_puts(c->wrbuf, ">");
     wrbuf_xmlputs(c->wrbuf, VERSION);
-    wrbuf_puts(c->wrbuf, "</pazpar2>");
+    wrbuf_puts(c->wrbuf, "</pazpar2>\n");
 
-
-    yaz_version(yaz_version_str, 0);
+    yaz_version(yaz_version_str, yaz_sha1_str);
     wrbuf_puts(c->wrbuf, "  <yaz compiled=\"");
     wrbuf_xmlputs(c->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, "</yaz>\n");
 
     wrbuf_puts(c->wrbuf, " </version>\n");
-    
+#if HAVE_UNISTD_H
+    {
+        char hostname_str[64];
+        if (gethostname(hostname_str, sizeof(hostname_str)) == 0)
+        {
+            wrbuf_puts(c->wrbuf, " <host>");
+            wrbuf_xmlputs(c->wrbuf, hostname_str);
+            wrbuf_puts(c->wrbuf, "</host>\n");
+        }
+    }
+#endif
     info_services(c->server, c->wrbuf);
 
-    wrbuf_puts(c->wrbuf, "</info>");
-    rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
-    http_send_response(c);
+    response_close(c, "info");
 }
 
 struct {
@@ -1220,9 +1532,11 @@ struct {
     { "exit", cmd_exit },
     { "session-status", cmd_session_status },
     { "server-status", cmd_server_status },
+    { "service", cmd_service },
     { "ping", cmd_ping },
     { "record", cmd_record },
     { "info", cmd_info },
+    { "stop", cmd_stop },
     {0,0}
 };