From 47126e10f92244359531971ef44837ddbf1ec013 Mon Sep 17 00:00:00 2001
From: Jared Camins-Esakov <jcamins@cpbibliography.com>
Date: Sun, 15 Jul 2012 09:30:58 -0400
Subject: [PATCH] Bug 8206: make authority search indexes consistent

This commit makes the search indexes used for search authorities in the
staff client and OPAC more consistent by using the Mainentry,
Match, and Any indexes for both, and adjusting the labels so that they
correctly describe what the indexes do.

Note that the Match index was chosen instead of the Match-heading index
because Match-heading has the additional attribute of being for phrase
searches and exact matches, whereas Match is used for keyword matching,
and is more applicable with GRS-1 indexed records (thanks to the
well-known limitations of GRS-1 and exact matching of headings).

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
No problem detected in UNIMARC
---
 .../prog/en/includes/authorities-search.inc   | 34 +++++++++----------
 .../prog/en/modules/opac-authorities-home.tt  |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
index ca6f4af696..7c090ebc1a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
@@ -2,8 +2,8 @@
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
 <!-- Begin Authorities Resident Search Box -->
 <div id="header_search" class="residentsearch">
-    <div id="authority_search" class="residentsearch">
-    <p class="tip">Enter authority heading ($a):</p>
+    <div id="main_heading" class="residentsearch">
+    <p class="tip">Enter authorized heading:</p>
     <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
         <input type="hidden" name="op" value="do_search" />
         <input type="hidden" name="type" value="intranet" />
@@ -17,23 +17,25 @@
             [% END %]
         [% END %]
         </select>
-        <input type="hidden" name="marclist" value="mainmainentry" />
+        <input type="hidden" name="marclist" value="mainentry" />
+        <input type="hidden" name="and_or" value="and" />
+        <input type="hidden" name="excluding" value="" />
         <select name="operator">
             <option value="contains">contains</option>
             <option value="start">starts with</option>
             <option value="is">is exactly</option>
         </select>
-        <input id="value_anywhere" type="text" name="value" value="[% value %]" />
+        <input id="value_mainentry" type="text" name="value" value="[% value %]" />
         <select name="orderby">
             <option value="">None</option>
             <option value="HeadingAsc" selected="selected">Heading A-Z</option>
             <option value="HeadingDsc">Heading Z-A</option>
-         </select>
-         <input type="submit" class="submit" value="Submit" />
+        </select>
+        <input type="submit" class="submit" value="Submit" />
     </form>
     </div>
-    <div id="main_heading" class="residentsearch">
-    <p class="tip">Enter authority heading:</p>
+    <div id="matchheading_search" class="residentsearch">
+    <p class="tip">Enter any heading:</p>
     <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
         <input type="hidden" name="op" value="do_search" />
         <input type="hidden" name="type" value="intranet" />
@@ -47,21 +49,19 @@
             [% END %]
         [% END %]
         </select>
-        <input type="hidden" name="marclist" value="mainentry" />
-        <input type="hidden" name="and_or" value="and" />
-        <input type="hidden" name="excluding" value="" />
+        <input type="hidden" name="marclist" value="match" />
         <select name="operator">
             <option value="contains">contains</option>
             <option value="start">starts with</option>
             <option value="is">is exactly</option>
         </select>
-        <input id="value_mainentry" type="text" name="value" value="[% value %]" />
+        <input id="value_matchheading" type="text" name="value" value="[% value %]" />
         <select name="orderby">
             <option value="">None</option>
             <option value="HeadingAsc" selected="selected">Heading A-Z</option>
             <option value="HeadingDsc">Heading Z-A</option>
-        </select>
-        <input type="submit" class="submit" value="Submit" />
+         </select>
+         <input type="submit" class="submit" value="Submit" />
     </form>
     </div>
     <div id="all_headings" class="residentsearch">
@@ -87,7 +87,7 @@
             <option value="start">starts with</option>
             <option value="is">is exactly</option>
         </select>
-        <input id="value_mainmainentry" type="text" name="value" value="[% value %]" />
+        <input id="value_anywhere" type="text" name="value" value="[% value %]" />
         <select name="orderby">
             <option value="">None</option>
             <option value="HeadingAsc" selected="selected">Heading A-Z</option>
@@ -97,9 +97,9 @@
     </form>
     </div>
     <ul>
-        <li><a href="#authority_search">Search authorities</a></li>
         <li><a href="#main_heading">Search main heading</a></li>
-        <li><a href="#all_headings">Search all headings</a></li>
+        <li><a href="#matchheading_search">Search all headings</a></li>
+        <li><a href="#all_headings">Keyword search</a></li>
     </ul>
 </div><!-- /header_search -->
 </div><!-- /gradient -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt
index f72d6a6ed1..93f27b9925 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tt
@@ -30,8 +30,8 @@
                 <input type="text" name="value" id="value" value="[% value %]" />
                 <select name="marclist" id="marclist">
                     <option value="any" selected="selected">in keyword</option>
-                    <option value="mainentry">in main entry</option>
                     <option value="match">in any heading</option>
+                    <option value="mainentry">in main entry</option>
                 </select>
                 <input type="hidden" name="and_ora" value="and" />
                 <input type="hidden" name="excluding" value="" />
-- 
2.39.5