One set of advanced search limiters

Let's use on set of limiters for the advanced search and Boolean search
pages. Also added a release notes entry for the development.

Signed-off-by: Kathy Lussier <klussier@masslnc.org>

diff --git a/Open-ILS/src/templates/opac/parts/advanced/boolean.tt2 b/Open-ILS/src/templates/opac/parts/advanced/boolean.tt2
index 3b4e36c..618f304 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/advanced/boolean.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/boolean.tt2
@@ -7,7 +7,7 @@
        <table cellpadding='10' cellspacing='0' border='0'>
        [%
                in_row = 0;
-               FOR adv_chunk IN search.bool_config;
+               FOR adv_chunk IN search.adv_config;
                        NEXT IF adv_chunk.adv_hide;
                        IF in_row == 0;
                                in_row = 1; %]
@@ -76,4 +76,4 @@
           </span>
     <a href="[% mkurl(ctx.opac_root _ '/advanced', {$loc_name => loc_value, pane => 'boolean'}, 1) %]"
         class="pointer opac-button">[% l('Clear Form') %]</a>
-</form>
\ No newline at end of file
+</form>

diff --git a/Open-ILS/src/templates/opac/parts/config.tt2 b/Open-ILS/src/templates/opac/parts/config.tt2
index 5d6e5ff..4fdda27 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/config.tt2
+++ b/Open-ILS/src/templates/opac/parts/config.tt2
@@ -144,25 +144,6 @@ search.adv_config = [
 # Set the default height of the select boxes. Defaults to 4.
 #search.default_adv_select_height = 4;
 
-##############################################################################
-# Define the boolean search limiters and labels.
-# adv_label is the (translated) label for the limiter
-# adv_attr is an array of possible limiters, the first one that has any
-#   values will be used
-# adv_break will end the current row. If specified with a label/attr it
-#   will do so *after* that limiter.
-# adv_special will drop in a special entry:
-#   sort_selector will put the sort results selector
-#   lib_selector will put the search library box (with limit to available)
-#   pub_year will put the publication year box
-
-search.bool_config = [
-    {adv_label => l("Item Type"), adv_attr => ["mattype", "item_type"]},
-    {adv_label => l("Language"),  adv_attr => "item_lang"},
-    {adv_label => l("Sort Results"), adv_special => "sort_selector", adv_break => 1},
-    {adv_label => l("Search Library"), adv_special => "lib_selector"},
-    {adv_label => l("Publication Year"), adv_special => "pub_year"},
-];
 
 ##############################################################################
 # Define if the boolean search tab is enabled on the

diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/boolean_search.txt b/docs/RELEASE_NOTES_NEXT/OPAC/boolean_search.txt
new file mode 100644 (file)
index 0000000..41dc9a4
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/OPAC/boolean_search.txt
@@ -0,0 +1,6 @@
+Free-form Boolean search tab
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The advanced search screen now has a _Boolean Search_ tab where users can enter a free-form Boolean search. In this interface, the words _and_, _or_, and _not_ are treated as Boolean search operators instead of search terms. 
+
+There is a search.boolean_enabled setting in config.tt2 that allows sites to
+enable/disable the Boolean Search tab.