From d832b0de5252047fc5c3f2353691945af5dff1ca Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Thu, 11 Jun 2020 11:17:23 -0400
Subject: [PATCH] Bug 25716: Add ability to specify additional options in
 koha-conf.xml for z3950_responder.pl when using koha-z3950-responder

The z39.50 responder has a number of command line options that are not
accessible if using the debian scripts to control it. We should be able
to set those options in the koha conf file to be passed to the script
itself.

Test Plan:
1) Apply this patch
2) Copy your kohaclone's koha-z3950-responder to /usr/sbin/koha-z3950-responder if necessary
3) Add "<z3950_responder_options>--add-item-status k</z3950_responder_options>" inside your <config> block in your koha-conf.xml file
4) Use koha-z3950-responder to start/restart the z39.50 responder, note the item status is now in subfield k!

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 debian/scripts/koha-z3950-responder | 4 +++-
 etc/koha-conf.xml                   | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/scripts/koha-z3950-responder b/debian/scripts/koha-z3950-responder
index 7f34bb4736..a3422d55d4 100755
--- a/debian/scripts/koha-z3950-responder
+++ b/debian/scripts/koha-z3950-responder
@@ -110,13 +110,15 @@ start_z3950()
     if ! is_z3950_running ${instancename}; then
         export KOHA_CONF="/etc/koha/sites/${instancename}/koha-conf.xml"
 
+        Z3950_ADDITIONAL_OPTS="$( xmlstarlet sel -t -v 'yazgfs/config/z3950_responder_options' $KOHA_CONF )"
+
         log_daemon_msg "Starting Z39.50/SRU daemon for ${instancename}"
 
         # Change to the instance's user dir
         current_dir=$(pwd)
         eval cd ~$instance_user
 
-        if ${Z3950RESPONDER} ${Z3950OPTS}; then
+        if ${Z3950RESPONDER} ${Z3950_ADDITIONAL_OPTS} ${Z3950OPTS}; then
             log_end_msg 0
         else
             log_end_msg 1
diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 118b6b8207..39a67e1f88 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -266,5 +266,10 @@
    <vhost></vhost>
  </message_broker>
 
+ <!-- See z3950_responder.pl for available options. The options -c, -u and -p are already passed automatically by koha-z3950-responder -->
+ <!--
+ <z3950_responder_options>--add-item-status k -t 5</z3950_responder_options>
+ -->
+
 </config>
 </yazgfs>
-- 
2.20.1