X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=cbe09aa10ee26cdff96375a7d0830971b7fa9e5f;hb=20bc8b17d60373c2c93ab6bb777d19dd92ed2960;hp=1cb1ae8e9516c8d05c7b479d4d9aea1cd8d2777d;hpb=ee40230fd0e997212b707fafcdec0da154fd1b21;p=pazpar2-moved-to-github.git

diff --git a/src/http_command.c b/src/http_command.c
index 1cb1ae8..cbe09aa 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 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
@@ -93,6 +93,8 @@ 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;
@@ -174,9 +176,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, "Session %u created. timeout chan=%p timeout=%d", 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);
@@ -190,7 +196,8 @@ void http_session_destroy(struct http_session *s)
 
     http_sessions_t http_sessions = s->http_sessions;
 
-    yaz_log(http_sessions->log_level, "Session %u destroy", 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)
@@ -207,15 +214,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, "Session %u destroyed", s->session_id);
+        session_log(s->psession, http_sessions->log_level, "About to destroyd");
         iochan_destroy(s->timeout_iochan);
         session_destroy(s->psession);
         http_session_use(-1);
         nmem_destroy(s->nmem);
     }
-    else {
-        yaz_log(http_sessions->log_level, "Session %u destroying delayed. Active clients (%d-%d). Waiting for new timeout.",
-                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);
     }
 
 }
@@ -405,7 +414,8 @@ static void cmd_exit(struct http_channel *c)
 
     response_open(c, "exit");
     response_close(c, "exit");
-    http_close_server(c->server);
+    if (global_parameters.debug_mode)
+        http_close_server(c->server);
 }
 
 static void cmd_init(struct http_channel *c)
@@ -451,11 +461,10 @@ 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, "Session init %u ", sesid);
     if (!clear || *clear == '0')
         session_init_databases(s->psession);
     else
-        yaz_log(YLOG_LOG, "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;
@@ -543,9 +552,8 @@ static void termlist_response(struct http_channel *c, struct http_session *s, co
 
     response_open_no_status(c, "termlist");
     /* new protocol add a status to response. Triggered by a status parameter */
-    if (cmd_status != 0) {
+    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);
@@ -562,8 +570,10 @@ static void termlist_result_ready(void *data)
     struct http_session *s = locate_session(c);
     if (report && !strcmp("status", report))
         status = "OK";
-    if (s) {
-        yaz_log(c->http_sessions->log_level, "Session %u termlist watch released", s->session_id);
+    if (s)
+    {
+        session_log(s->psession, c->http_sessions->log_level,
+                    "termlist watch released");
         termlist_response(c, s, status);
         release_session(c,s);
     }
@@ -580,11 +590,14 @@ static void cmd_termlist(struct http_channel *c)
     int report_error = 0;
     const char *status_message = 0;
     int active_clients;
-    if (report  && !strcmp("error", report)) {
+
+    if (report && !strcmp("error", report))
+    {
         report_error = 1;
         status_message = "OK";
     }
-    if (report  && !strcmp("status", report)) {
+    if (report && !strcmp("status", report))
+    {
         report_status = 1;
         status_message = "OK";
     }
@@ -598,22 +611,23 @@ static void cmd_termlist(struct http_channel *c)
         if (session_set_watch(s->psession, SESSION_WATCH_TERMLIST,
                               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);
+            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) {
+            else if (report_status)
                 status_message = "WARNING (Already blocked on termlist)";
-            }
-            else {
-                yaz_log(YLOG_WARN, "Session %u: Ignoring termlist block. Return current result", s->session_id);
-            }
+            else
+                session_log(s->psession, YLOG_WARN,
+                            "Ignoring termlist block. Return current result");
         }
         else
         {
-            yaz_log(c->http_sessions->log_level, "Session %u: Blocking on command termlist", s->session_id);
+            session_log(s->psession, c->http_sessions->log_level,
+                        "Blocking on command termlist");
             release_session(c, s);
             return;
         }
@@ -706,7 +720,8 @@ static void bytarget_response(struct http_channel *c, struct http_session *s, co
     }
 
     if (count == 0)
-        yaz_log(YLOG_WARN, "Empty bytarget Response. No targets found!");
+        session_log(s->psession, YLOG_WARN,
+                    "Empty bytarget Response. No targets found!");
     for (i = 0; i < count; i++)
     {
         wrbuf_puts(c->wrbuf, "\n<target>");
@@ -726,6 +741,9 @@ static void bytarget_response(struct http_channel *c, struct http_session *s, co
         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);
@@ -761,14 +779,16 @@ 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);
+    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");
-    }
+    else
+        yaz_log(c->http_sessions->log_level,
+                "No Session found for released bytarget watch");
 }
 
 
@@ -784,39 +804,40 @@ static void cmd_bytarget(struct http_channel *c)
     const char *status_message = "OK";
     int no_active;
 
-    if (report && !strcmp("error", report)) {
+    if (report && !strcmp("error", report))
         report_error = 1;
-    }
-    if (report && !strcmp("status", report)) {
+    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 (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)
         {
-            yaz_log(YLOG_WARN, "Session %u: Attempt to block multiple times on bytarget block. Not supported!", s->session_id);
-            if (report_error) {
+            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) {
+            else if (report_status)
                 status_message = "WARNING (Already blocked on bytarget)";
-            }
             else {
-                yaz_log(YLOG_WARN, "Session %u: Ignoring bytarget block. Return current result.", s->session_id);
+                session_log(s->psession, YLOG_WARN, "Ignoring bytarget block."
+                            " Return current result.");
             }
         }
         else
         {
-            yaz_log(c->http_sessions->log_level, "Session %u: Blocking on command bytarget", s->session_id);
+            session_log(s->psession, c->http_sessions->log_level,
+                        "Blocking on command bytarget");
             release_session(c, s);
             return;
         }
@@ -826,7 +847,7 @@ static void cmd_bytarget(struct http_channel *c)
 }
 
 static void write_metadata(WRBUF w, struct conf_service *service,
-        struct record_metadata **ml, int full)
+                           struct record_metadata **ml, int full, int indent)
 {
     int imeta;
 
@@ -839,7 +860,10 @@ static void write_metadata(WRBUF w, struct conf_service *service,
         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)
             {
@@ -862,7 +886,7 @@ static void write_metadata(WRBUF w, struct conf_service *service,
                     wrbuf_puts(w, "[can't represent]");
                     break;
             }
-            wrbuf_printf(w, "</md-%s>", cmd->name);
+            wrbuf_printf(w, "</md-%s>\n", cmd->name);
         }
     }
 }
@@ -873,20 +897,20 @@ static void write_subrecord(struct record *r, WRBUF w,
     const char *name = session_setting_oneval(
         client_get_database(r->client), PZ_NAME);
 
-    wrbuf_puts(w, "<location id=\"");
+    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, "checksum=\"");
     wrbuf_printf(w,  "%u", r->checksum);
-    wrbuf_puts(w, "\">");
+    wrbuf_puts(w, "\">\n");
 
-    write_metadata(w, service, r->metadata, show_details);
-    wrbuf_puts(w, "</location>\n");
+    write_metadata(w, service, r->metadata, show_details, 2);
+    wrbuf_puts(w, " </location>\n");
 }
 
 static void show_raw_record_error(void *data, const char *addinfo)
@@ -1024,26 +1048,26 @@ static void show_record(struct http_channel *c, struct http_session *s)
     {
         struct record *r;
         response_open_no_status(c, "record");
-        wrbuf_puts(c->wrbuf, "\n<recid>");
+        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, 1, 1);
         for (r = rec->records; r; r = r->next)
-            write_subrecord(r, c->wrbuf, service, 1);
+            write_subrecord(r, c->wrbuf, service, 2);
         response_close(c, "record");
     }
     show_single_stop(s->psession, rec);
@@ -1053,8 +1077,10 @@ static void cmd_record_ready(void *data)
 {
     struct http_channel *c = (struct http_channel *) data;
     struct http_session *s = locate_session(c);
-    if (s) {
-        yaz_log(c->http_sessions->log_level, "Session %u: record watch released", s->session_id);
+    if (s)
+    {
+        session_log(s->psession, c->http_sessions->log_level,
+                    "record watch released");
         show_record(c, s);
         release_session(c,s);
     }
@@ -1111,7 +1137,10 @@ static void show_records(struct http_channel *c, struct http_session *s, int act
 
     }
 
-    rl = show_range_start(s->psession, sp, startn, &numn, &total, &total_hits, &approx_hits);
+    rl = show_range_start(s->psession, sp, startn, &numn, &total,
+                          &total_hits, &approx_hits, show_records_ready, c);
+    if (!rl)
+        return;
 
     response_open(c, "show");
     wrbuf_printf(c->wrbuf, "\n<activeclients>%d</activeclients>\n", active);
@@ -1131,21 +1160,23 @@ static void show_records(struct http_channel *c, struct http_session *s, int act
         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, 0, 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);
+        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_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");
+            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_puts(c->wrbuf, " <recid>");
         wrbuf_xmlputs(c->wrbuf, rec->recid);
         wrbuf_puts(c->wrbuf, "</recid>\n");
         wrbuf_puts(c->wrbuf, "</hit>\n");
@@ -1160,8 +1191,10 @@ static void show_records_ready(void *data)
 {
     struct http_channel *c = (struct http_channel *) data;
     struct http_session *s = locate_session(c);
-    if (s) {
-        yaz_log(c->http_sessions->log_level, "Session %u: show watch released", s->session_id);
+    if (s)
+    {
+        session_log(s->psession, c->http_sessions->log_level,
+                    "show watch released");
         show_records(c, s, -1);
     }
     else {
@@ -1200,7 +1233,7 @@ static void cmd_show(struct http_channel *c)
         release_session(c, s);
         return;
     }
-    session_sort(s->psession, sp->name, sp->increasing, sp->type == Metadata_sortkey_position);
+    session_sort(s->psession, sp);
 
     status = session_active_clients(s->psession);
 
@@ -1212,23 +1245,27 @@ static void cmd_show(struct http_channel *c)
             if (session_set_watch(s->psession, SESSION_WATCH_SHOW_PREF,
                                   show_records_ready, c, c) == 0)
             {
-                yaz_log(c->http_sessions->log_level,
-                        "Session %u: Blocking on command show (preferred targets)", s->session_id);
+                session_log(s->psession, c->http_sessions->log_level,
+                            "Blocking on command show (preferred targets)");
                 release_session(c, s);
                 return;
             }
             else
             {
-                yaz_log(YLOG_WARN, "Session %u: Attempt to block multiple times on show (preferred targets) block. Not supported!",
-                    s->session_id);
-                if (report_error) {
-                    error(rs, PAZPAR2_ALREADY_BLOCKED, "show (preferred targets)");
+                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 {
-                    yaz_log(YLOG_WARN, "Session %u: Ignoring show(preferred) block. Returning current result.", s->session_id);
-                }
+                else
+                    session_log(s->psession, YLOG_WARN,
+                                "Ignoring show(preferred) block."
+                                " Returning current result");
             }
 
         }
@@ -1238,19 +1275,22 @@ static void cmd_show(struct http_channel *c)
             if (session_set_watch(s->psession, SESSION_WATCH_SHOW,
                                   show_records_ready, c, c) != 0)
             {
-                yaz_log(YLOG_WARN, "Session %u: Attempt to block multiple times on show block. Not supported!", s->session_id);
-                if (report_error) {
+                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 {
-                    yaz_log(YLOG_WARN, "Session %u: Ignoring show block. Returning current result.", s->session_id);
-                }
+                else
+                    session_log(s->psession, YLOG_WARN, "Ignoring show block."
+                                " Returning current result");
             }
             else
             {
-                yaz_log(c->http_sessions->log_level, "Session %u: Blocking on command show", s->session_id);
+                session_log(s->psession, c->http_sessions->log_level,
+                            "Blocking on command show");
                 release_session(c, s);
                 return;
             }
@@ -1346,17 +1386,17 @@ static void cmd_stat(struct http_channel *c)
     }
 
     response_open_no_status(c, "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_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);
 }
@@ -1364,26 +1404,39 @@ static void cmd_stat(struct http_channel *c)
 static void cmd_info(struct http_channel *c)
 {
     char yaz_version_str[20];
+    char yaz_sha1_str[42];
 
     response_open_no_status(c, "info");
-    wrbuf_puts(c->wrbuf, " <version>\n");
+    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);
 
     response_close(c, "info");