X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fhttp_command.c;h=004abba45be2d761b38814a237318a33e4d6c252;hb=710ee248da13fb269e18d87e464ce2da038ea370;hp=cbe09aa10ee26cdff96375a7d0830971b7fa9e5f;hpb=20bc8b17d60373c2c93ab6bb777d19dd92ed2960;p=pazpar2-moved-to-github.git

diff --git a/src/http_command.c b/src/http_command.c
index cbe09aa..004abba 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1211,6 +1211,7 @@ static void cmd_show(struct http_channel *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");
     struct conf_service *service = 0;
 
     struct reclist_sortparms *sp;
@@ -1233,7 +1234,7 @@ static void cmd_show(struct http_channel *c)
         release_session(c, s);
         return;
     }
-    session_sort(s->psession, sp);
+    session_sort(s->psession, sp, mergekey);
 
     status = session_active_clients(s->psession);
 
@@ -1321,6 +1322,7 @@ static void cmd_search(struct http_channel *c)
     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");
     enum pazpar2_error_code code;
     const char *addinfo = 0;
     struct reclist_sortparms *sp;
@@ -1353,7 +1355,7 @@ static void cmd_search(struct http_channel *c)
     }
 
     code = session_search(s->psession, query, startrecs, maxrecs, filter, limit,
-                          &addinfo, sp);
+                          &addinfo, sp, mergekey);
     if (code)
     {
         error(rs, code, addinfo);