New element <message> in bytarget response

[pazpar2-moved-to-github.git] / src / http_command.c

diff --git a/src/http_command.c b/src/http_command.c
index 2aca50e..9fc50a8 100644 (file)
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -726,6 +726,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);
@@ -1142,10 +1145,13 @@ static void show_records(struct http_channel *c, struct http_session *s, int act
         {
            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_xmlputs(c->wrbuf, rec->recid);
@@ -1202,7 +1208,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);