From e95f48b665e998fbccc380b0c7031270840f2287 Mon Sep 17 00:00:00 2001
From: Mike Rylander <mrylander@gmail.com>
Date: Wed, 7 Dec 2016 16:47:01 -0500
Subject: [PATCH] LP#1663374: Allow metarecord searching by default

Before the TPAC, a site could configure the OPAC to use metarecord searching
by default, via a configuration file.  Here we bring that back.

A new setting is present in templates/opac/parts/config.tt2 to enable this
feature.  By setting this to a true value (normally 1) the TPAC will silently
include the #metabib search modifier in the search form on any interfaces that
do not have a UI component that allows the user to control the setting.

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm  | 2 ++
 Open-ILS/src/templates/opac/parts/advanced/search.tt2 | 2 +-
 Open-ILS/src/templates/opac/parts/config.tt2          | 3 +++
 Open-ILS/src/templates/opac/parts/searchbar.tt2       | 6 ++++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
index c5b2840624..3b1a661e65 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
@@ -156,6 +156,8 @@ sub load {
     return $self->load_logout if $path =~ m|opac/logout|;
     return $self->load_patron_reg if $path =~ m|opac/register|;
 
+    $self->load_simple("myopac") if $path =~ m:opac/myopac:; # A default page for myopac parts
+
     if($path =~ m|opac/login|) {
         return $self->load_login unless $self->editor->requestor; # already logged in?
 
diff --git a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
index dc650a1c7b..5ea98bf419 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
@@ -132,7 +132,7 @@
                             <input> (below) to drop down inline w/ its label -->
                         <div class="adv_search_available">
                             <input type='checkbox' name="modifier" value="metabib"
-                              [%- CGI.param('modifier').grep('metabib').size ?
+                              [%- CGI.param('modifier').grep('metabib').size || search.metarecord_default ?
                                     ' checked="checked"' : '' %]
                                 id='opac.result.ismetabib' />
                             <label for='opac.result.ismetabib'>
diff --git a/Open-ILS/src/templates/opac/parts/config.tt2 b/Open-ILS/src/templates/opac/parts/config.tt2
index 58d2c09e41..3585ba7d96 100644
--- a/Open-ILS/src/templates/opac/parts/config.tt2
+++ b/Open-ILS/src/templates/opac/parts/config.tt2
@@ -167,6 +167,9 @@ search.basic_config = {
     none_label => l("All Formats"),
 };
 
+# Make metarecord search the default.
+#search.metarecord_default = 1;
+
 ##############################################################################
 # Show Google Book Previews
 # Set to 1 or 'true' to enable
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 9d6a0dd75f..f807134dca 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -17,6 +17,12 @@ END;
     [% UNLESS took_care_of_form -%]
     <form action="[% ctx.opac_root %]/results" method="get">
     [%- END %]
+    [% IF ctx.page == 'rresult' && ctx.metarecord && search.metarecord_default %]
+    <input type="hidden" name="modifier" value="metabib"/>
+    [% END %]
+    [% IF (ctx.page == 'place_hold' || ctx.page == 'myopac' || ctx.page == 'home' || ctx.page == 'record') && search.metarecord_default %]
+    <input type="hidden" name="modifier" value="metabib"/>
+    [% END %]
     <div id="search-box">
         <span class="search_catalog_lbl mobile_hide">[% l('Search the Catalog') %]</span>
         <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/advanced', {},  expert_search_parms.merge(browse_search_parms, facet_search_parms)) %]"
-- 
2.11.0