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>

diff --git a/catalogue/search.pl b/catalogue/search.pl
index 2f05649..80b4cdc 100755 (executable)
--- 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 b9c9083..7b2e030 100644 (file)
--- 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 bf83038..153e390 100644 (file)
--- 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 9a56b64..0c45b5c 100755 (executable)
--- 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 dc544a3..74136b7 100644 (file)
--- 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 d27032e..d207e79 100644 (file)
--- 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 6dd994c..13e0a5f 100644 (file)
--- 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 6ae46e5..5d86fac 100644 (file)
--- 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 190c885..a574eef 100644 (file)
--- 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 f189555..7a7673f 100644 (file)
--- 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 128fd00..990be0b 100644 (file)
--- 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 eeb8362..d99248b 100644 (file)
--- 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 9a0a8a0..0f6d6ba 100644 (file)
--- 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 a1c3f4b..5b00a23 100644 (file)
--- 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 dfaf653..62886f7 100644 (file)
--- 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 ad37643..940695d 100644 (file)
--- 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 1d4408b..cfb1bf3 100644 (file)
--- 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 8c56245..a407024 100755 (executable)
--- 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