From 4fcddf80d559e2d7feeaa97c4bb114c8d2876ebd Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Thu, 4 Jan 2018 15:31:52 +0000
Subject: [PATCH] Bug 19916: Add keyword and standard ID fields to acq external
 search

To test:
1 - Add an order from external source
2 - Note you don't have keyword or standard ID fields
3 - Add a catalog record from Z3950, note those fields are there
4 - Apply patch
5 - Check acq and note you do have those fields
6 - Do some searches to verify they work as expected

Signed-off-by: Maksim Sen <maksim.sen@inlibro.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 acqui/z3950_search.pl                                     | 8 ++++++--
 .../intranet-tmpl/prog/en/modules/acqui/z3950_search.tt   | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/acqui/z3950_search.pl b/acqui/z3950_search.pl
index 59f9f3637c..06c4a9f12f 100755
--- a/acqui/z3950_search.pl
+++ b/acqui/z3950_search.pl
@@ -42,6 +42,8 @@ my $issn            = $input->param('issn');
 my $lccn            = $input->param('lccn');
 my $lccall          = $input->param('lccall');
 my $subject         = $input->param('subject');
+my $srchany         = $input->param('srchany');
+my $stdid           = $input->param('stdid');
 my $dewey           = $input->param('dewey');
 my $controlnumber   = $input->param('controlnumber');
 my $op              = $input->param('op')||'';
@@ -79,6 +81,8 @@ $template->param(
         biblionumber => $biblionumber,
         dewey        => $dewey,
         subject      => $subject,
+        srchany      => $srchany,
+        stdid        => $stdid,
 );
 
 if ( $op ne "do_search" ) {
@@ -119,8 +123,8 @@ my $pars= {
         subject => $subject,
         lccall => $lccall,
         controlnumber => $controlnumber,
-        stdid => 0,
-        srchany => 0,
+        stdid => $stdid,
+        srchany => $srchany,
 };
 Z3950Search($pars, $template);
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index ddf104ad8e..8cea37cb3d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -70,7 +70,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
              <li><label for="author">Author: </label> <input type="text" id="author" name="author" value="[% author | html %]" /></li>
              <li><label for="issn">ISSN: </label> <input type="text" id="issn" name="issn" value="[% issn | html %]" /></li>
              <li><label for="subject">Subject heading: </label> <input type="text" id="subject" name="subject" value="" /></li>
+             <li><label for="srchany">Keyword (any): </label> <input type="text" id="srchany" name="srchany" value="" /></li>
              <li><label for="dewey">Dewey: </label> <input type="text" id="dewey" name="dewey" value="" /></li>
+             <li><label for="stdid">Standard ID: </label> <input type="text" id="stdid" name="stdid" value="" /></li>
              <li><label for="frameworkcode" >Select MARC framework:</label>
              <select id="frameworkcode" name="frameworkcode" >
              <option value="">Default</option>
-- 
2.39.5