From 1d7f30b745805b3e08cc3cf6362b9dd9b92d29e6 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 12 Jun 2014 11:06:56 +0200
Subject: [PATCH] Add pz:redis option

---
 doc/pazpar2_conf.xml |   17 +++++++++++++++++
 src/connection.c     |    3 +++
 src/settings.c       |    1 +
 src/settings.h       |    1 +
 4 files changed, 22 insertions(+)

diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml
index c6325f4..95cd62c 100644
--- a/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@ -1315,6 +1315,23 @@
     </varlistentry>
 
     <varlistentry>
+     <term>pz:redis</term>
+     <listitem>
+      <para>
+       If set and non-empty,
+       <ulink url="&url.redis;">redis</ulink> will
+       configured and enabled for the target.
+       The value of this setting is exactly as the redis option for
+       ZOOM C of YAZ.
+      </para>
+      <para>
+       This setting is honored in Pazpar2 1.6.43 or later. Pazpar2 must
+       be using YAZ version 5.2.0 or later.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
      <term>pz:nativesyntax</term>
      <listitem>
       <para>
diff --git a/src/connection.c b/src/connection.c
index 41e693c..402bfcc 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -421,6 +421,7 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man)
     struct session_database *sdb = client_get_database(con->client);
     const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
     const char *memcached = session_setting_oneval(sdb, PZ_MEMCACHED);
+    const char *redis = session_setting_oneval(sdb, PZ_REDIS);
 
     assert(con);
 
@@ -432,6 +433,8 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man)
         ZOOM_options_set(zoptions, "charset", charset);
     if (memcached && *memcached)
         ZOOM_options_set(zoptions, "memcached", memcached);
+    if (redis && *redis)
+        ZOOM_options_set(zoptions, "redis", redis);
 
     assert(host->ipport);
     if (host->proxy)
diff --git a/src/settings.c b/src/settings.c
index e8d6125..a17d094 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -85,6 +85,7 @@ static char *hard_settings[] = {
     "pz:authentication_mode",
     "pz:native_score",
     "pz:memcached",
+    "pz:redis",
     0
 };
 
diff --git a/src/settings.h b/src/settings.h
index 3f306a0..de43d28 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -58,6 +58,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define PZ_AUTHENTICATION_MODE  35
 #define PZ_NATIVE_SCORE         36
 #define PZ_MEMCACHED            37
+#define PZ_REDIS                38
 #define PZ_MAX_EOF              39
 
 struct setting
-- 
1.7.10.4