Allow mergekey to be given for command=search

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

diff --git a/src/session.c b/src/session.c
index ed80133..187ae38 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -752,7 +752,8 @@ enum pazpar2_error_code session_search(struct session *se,
                                        const char *filter,
                                        const char *limit,
                                        const char **addinfo,
-                                       struct reclist_sortparms *sp)
+                                       struct reclist_sortparms *sp,
+                                       const char *mergekey)
 {
     int live_channels = 0;
     int no_working = 0;
@@ -773,6 +774,12 @@ enum pazpar2_error_code session_search(struct session *se,
     session_enter(se, "session_search");
     se->settings_modified = 0;
 
+    if (mergekey)
+    {
+        xfree(se->mergekey);
+        se->mergekey = *mergekey ? xstrdup(mergekey) : 0;
+    }
+
     session_clear_set(se, sp);
     relevance_destroy(&se->relevance);