From 38884abf65f4da5da03fbe73824a29b5bfc5fb32 Mon Sep 17 00:00:00 2001
From: Paul POULAIN <paul@koha-fr.org>
Date: Wed, 24 Oct 2007 14:35:25 -0500
Subject: [PATCH] reverting defaut-search-on-kw-wrdl and doing it elsewhere

The patch default search on kw-wrdl is bugguy, as there ca be 2 idx (maybe an API limit,not sure)

So i've reverted it and added kw,wrdl on every place there is a query (the search boxes)

QUESTION : isn't it possible to have a single query for catalogue, that is TMPL_INCLUDE'd ?

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 catalogue/search.pl                           |  2 -
 koha-tmpl/intranet-tmpl/prog/en/css/blue.css  |  4 ++
 .../prog/en/includes/cat-search.inc           |  5 ++-
 .../prog/en/includes/circ-search.inc          | 40 +++++++------------
 .../prog/en/includes/cities-admin-search.inc  |  1 +
 .../en/includes/currencies-admin-search.inc   |  5 ++-
 .../prog/en/includes/letters-search.inc       |  5 ++-
 .../prog/en/includes/members-search.inc       |  5 ++-
 .../prog/en/includes/patrons-admin-search.inc |  5 ++-
 .../en/includes/printers-admin-search.inc     |  5 ++-
 .../en/includes/roadtype-admin-search.inc     |  5 ++-
 .../prog/en/includes/serials-search.inc       |  5 ++-
 .../en/includes/stopwords-admin-search.inc    |  5 ++-
 .../en/includes/suggestions-add-search.inc    |  5 ++-
 .../prog/en/includes/z3950-admin-search.inc   |  5 ++-
 .../fr/includes/circ-search-autocompl.inc     |  3 +-
 .../opac-tmpl/prog/en/includes/masthead.inc   |  1 +
 opac/opac-search.pl                           |  2 -
 18 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/catalogue/search.pl b/catalogue/search.pl
index 2f05649709..80b4cdcd48 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -339,8 +339,6 @@ my @operators;
 my @indexes;
 if ($params->{'idx'}) {
     @indexes = split("\0",$params->{'idx'});
-} else {
-    $indexes[0] = 'kw,wrdl';
 }
 
 # an operand can be a single term, a phrase, or a complete ccl query
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/blue.css b/koha-tmpl/intranet-tmpl/prog/en/css/blue.css
index b9c90830ba..7b2e030580 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/blue.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/blue.css
@@ -74,3 +74,7 @@ input[type=submit], input[type=button], input[type=reset] {
 input[type=submit]:hover, input[type=button]:hover, input[type=reset]:hover {
     border:1px outset;
 }
+
+#bd {
+background-color:white;
+}
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index bf83038dce..153e390252 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -13,8 +13,9 @@
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                    <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+                    <input type="hidden" name="idx" value="kw,wrdl" />
+                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
 		</form>
 	</div>
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index 9a56b64758..0c45b5c12a 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -147,30 +147,20 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 <!-- /TMPL_IF -->
 
     </form>
-</div>  
-
-<div id="checkin_search" class="residentsearch">
-    <p class="tip">Scan a barcode to check in:</p>
-    <form method="post" action="/cgi-bin/koha/circ/returns.pl">
-        <input name="barcode" id="ret_barcode" size="40" maxlength="14" />
-        <input value="Submit" type="submit" />
-    </form>
-</div>
-
-<div id="catalog_search" class="residentsearch">
-    <p class="tip">Enter search keywords:</p>
-    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-        <input type="text" name="q" id="search-form" size="40" />
-        <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
-    </form>
-</div>
-
-<ul>
-    <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
-    <li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check In</a></li>
-    <li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
-</ul>   
-
+	</div>
+	<div id="catalog_search" class="residentsearch">
+	<p class="tip">Enter search keywords:</p>
+		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+                    <input type="text" name="q" id="search-form" size="40" />
+                    <input type="hidden" name="idx" value="kw,wrdl" />
+                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+		</form>
+	</div>
+			<ul>
+			<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
+			<li><a href="/cgi-bin/koha/circ/returns.pl#checkin_search">Check In</a></li>
+			<li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
+			</ul>	
 </div>
 
-<!-- End Circulation Resident Search Box -->
\ No newline at end of file
+<!-- End Circulation Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
index dc544a3632..74136b7aa4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
@@ -22,6 +22,7 @@
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
 				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+				<input type="hidden" name="idx" value="kw,wrdl" />
 		</form>
 	</div>
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
index d27032eb8c..d207e79a31 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
@@ -20,8 +20,9 @@
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                    <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+                    <input type="hidden" name="idx" value="kw,wrdl" />
+                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
 		</form>
 	</div>
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
index 6dd994c9b4..13e0a5f0d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -20,8 +20,9 @@
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                    <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+                    <input type="hidden" name="idx" value="kw,wrdl" />
+                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
 		</form>
 	</div>
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
index 6ae46e5d13..5d86facb40 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
@@ -25,8 +25,9 @@
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                    <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+                    <input type="hidden" name="idx" value="kw,wrdl" />
+                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
 		</form>
 	</div>
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
index 190c885f87..a574eef961 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
@@ -20,8 +20,9 @@
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                    <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+                    <input type="hidden" name="idx" value="kw,wrdl" />
+                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
 		</form>
 	</div>
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
index f18955551b..7a7673f6a7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
@@ -20,8 +20,9 @@
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                    <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+                    <input type="hidden" name="idx" value="kw,wrdl" />
+                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
 		</form>
 	</div>
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
index 128fd00532..990be0bd88 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
@@ -20,8 +20,9 @@
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                    <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+                    <input type="hidden" name="idx" value="kw,wrdl" />
+                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
 		</form>
 	</div>
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
index eeb8362fcb..d99248b856 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -17,8 +17,9 @@
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                    <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+                    <input type="hidden" name="idx" value="kw,wrdl" />
+                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
 		</form>
 	</div>
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
index 9a0a8a0fac..0f6d6bacda 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
@@ -21,8 +21,9 @@
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                    <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+                    <input type="hidden" name="idx" value="kw,wrdl" />
+                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
 		</form>
 	</div>
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
index a1c3f4b9ef..5b00a23161 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
@@ -22,8 +22,9 @@
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                    <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+                    <input type="hidden" name="idx" value="kw,wrdl" />
+                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
 		</form>
 	</div>
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
index dfaf653c3d..62886f7d9f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
@@ -20,8 +20,9 @@
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
+                    <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+                    <input type="hidden" name="idx" value="kw,wrdl" />
+                    <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
 		</form>
 	</div>
 			<ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-search-autocompl.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-search-autocompl.inc
index ad37643d48..940695d78e 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-search-autocompl.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/circ-search-autocompl.inc
@@ -102,7 +102,8 @@
     <p class="tip">Entrer les termes de recherche :</p>
     <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
         <input type="text" name="q" id="search-form" size="40" />
-        <input type="submit" name="op" id="opac-submit" value="Valider" class="form-submit">
+        <input type="hidden" name="idx" value="kw,wrdl" />
+        <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
     </form>
 </div>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 1d4408b2f5..cfb1bf3b9e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -17,6 +17,7 @@
         <!-- TMPL_IF name="mylibraryfirst" --><!-- TMPL_IF name="loggedinusername" -->
             <input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
         <!-- /TMPL_IF --><!-- /TMPL_IF -->
+        <input type="hidden" name="idx" value="kw,wrdl" />
         <input type="submit" value="OK" class="submit" />
     </form>
     <a href="/cgi-bin/koha/opac-search.pl">more search options</a>
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 8c56245a9d..a40702499b 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -372,8 +372,6 @@ my @operators;
 my @indexes;
 if ($params->{'idx'}) {
     @indexes = split("\0",$params->{'idx'});
-} else {
-    $indexes[0] = 'kw,wrdl';
 }
 
 # an operand can be a single term, a phrase, or a complete ccl query
-- 
2.39.5