From 758dc6cd3c78702560abae42596fde05ae7bbdc3 Mon Sep 17 00:00:00 2001
From: sv3n <github-sr@hotmail.com>
Date: Wed, 22 Dec 2021 22:52:36 +0100
Subject: [PATCH] make fulltext search separator (OR/AND) configurable from
 backend (#1852)

* Change fulltext search separator (OR/AND) from backend

* Added doc

* Updated README.md
---
 README.md                                     |  1 +
 .../Backend/Catalog/Search/Separator.php      | 24 +++++++++++++++++++
 .../Source/Catalog/Search/Separator.php       | 23 ++++++++++++++++++
 .../Mage/Catalog/Block/Product/Abstract.php   |  5 +---
 .../Mage/CatalogSearch/Model/Fulltext.php     |  1 +
 .../CatalogSearch/Model/Resource/Fulltext.php |  3 ++-
 .../core/Mage/CatalogSearch/etc/config.xml    |  1 +
 .../core/Mage/CatalogSearch/etc/system.xml    | 10 ++++++++
 8 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Separator.php
 create mode 100644 app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Separator.php

diff --git a/README.md b/README.md
index b5fccbfcfe0..b5df5529d0c 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,7 @@ Most important changes will be listed here, all other changes since `19.4.0` can
 - `admin/design/use_legacy_theme`
 - `admin/emails/admin_notification_email_template`
 - `catalog/product_image/progressive_threshold`
+- `catalog/search/search_separator`
 
 ### New Events
 - `adminhtml_block_widget_form_init_form_values_after`
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Separator.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Separator.php
new file mode 100644
index 00000000000..269892b396e
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Catalog/Search/Separator.php
@@ -0,0 +1,24 @@
+<?php
+
+class Mage_Adminhtml_Model_System_Config_Backend_Catalog_Search_Separator extends Mage_Core_Model_Config_Data
+{
+    /**
+     * After change Catalog Search Type process
+     *
+     * @return $this
+     */
+    protected function _afterSave()
+    {
+        $newValue = $this->getValue();
+        $oldValue = Mage::getConfig()->getNode(
+            Mage_CatalogSearch_Model_Fulltext::XML_PATH_CATALOG_SEARCH_SEPARATOR,
+            $this->getScope(),
+            $this->getScopeId()
+        );
+        if ($newValue != $oldValue) {
+            Mage::getSingleton('catalogsearch/fulltext')->resetSearchResults();
+        }
+
+        return $this;
+    }
+}
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Separator.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Separator.php
new file mode 100644
index 00000000000..0617da3cdd1
--- /dev/null
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Catalog/Search/Separator.php
@@ -0,0 +1,23 @@
+<?php
+
+class Mage_Adminhtml_Model_System_Config_Source_Catalog_Search_Separator
+{
+    /**
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        $types = [
+            ' OR ' => 'OR (default)',
+            ' AND ' => 'AND'
+        ];
+        $options = [];
+        foreach ($types as $k => $v) {
+            $options[] = [
+                'value' => $k,
+                'label' => $v
+            ];
+        }
+        return $options;
+    }
+}
diff --git a/app/code/core/Mage/Catalog/Block/Product/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/Abstract.php
index 9aa165eb0c3..e2028b9d2a1 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Abstract.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Abstract.php
@@ -383,15 +383,12 @@ public function getTierPriceHtml($product = null, $parent = null)
             ->callParentToHtml();
     }
 
-    /*
+    /**
      * Calls the object's to Html method.
      * This method exists to make the code more testable.
      * By having a protected wrapper for the final method toHtml, we can 'mock' out this method
      * when unit testing
      *
-     *  @return string
-     */
-    /**
      * @return string
      */
     protected function callParentToHtml()
diff --git a/app/code/core/Mage/CatalogSearch/Model/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Fulltext.php
index a1bebe26b30..886e8a3f22f 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Fulltext.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Fulltext.php
@@ -48,6 +48,7 @@ class Mage_CatalogSearch_Model_Fulltext extends Mage_Core_Model_Abstract
     const SEARCH_TYPE_FULLTEXT          = 2;
     const SEARCH_TYPE_COMBINE           = 3;
     const XML_PATH_CATALOG_SEARCH_TYPE  = 'catalog/search/search_type';
+    const XML_PATH_CATALOG_SEARCH_SEPARATOR  = 'catalog/search/search_separator';
 
     /**
      * Whether table changes are allowed
diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php
index c2e4c3bd5ea..56159ca66ba 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Fulltext.php
@@ -355,7 +355,8 @@ public function prepareResult($object, $queryText, $query)
             }
 
             if ($like) {
-                $likeCond = '(' . implode(' OR ', $like) . ')';
+                $separator = Mage::getStoreConfig(Mage_CatalogSearch_Model_Fulltext::XML_PATH_CATALOG_SEARCH_SEPARATOR);
+                $likeCond = '(' . implode($separator, $like) . ')';
             }
         }
 
diff --git a/app/code/core/Mage/CatalogSearch/etc/config.xml b/app/code/core/Mage/CatalogSearch/etc/config.xml
index 1b9d82a4393..b8d7943fba6 100644
--- a/app/code/core/Mage/CatalogSearch/etc/config.xml
+++ b/app/code/core/Mage/CatalogSearch/etc/config.xml
@@ -137,6 +137,7 @@
                 <max_query_length>128</max_query_length>
                 <max_query_words>10</max_query_words>
                 <search_type>1</search_type>
+                <search_separator> OR </search_separator>
                 <use_layered_navigation_count>2000</use_layered_navigation_count>
                 <show_autocomplete_results_count>1</show_autocomplete_results_count>
             </search>
diff --git a/app/code/core/Mage/CatalogSearch/etc/system.xml b/app/code/core/Mage/CatalogSearch/etc/system.xml
index 32f8fda4deb..0c93c89ad8d 100644
--- a/app/code/core/Mage/CatalogSearch/etc/system.xml
+++ b/app/code/core/Mage/CatalogSearch/etc/system.xml
@@ -98,6 +98,16 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                         </search_type>
+                        <search_separator translate="label">
+                            <label>Fulltext Separator</label>
+                            <frontend_type>select</frontend_type>
+                            <backend_model>adminhtml/system_config_backend_catalog_search_separator</backend_model>
+                            <source_model>adminhtml/system_config_source_catalog_search_separator</source_model>
+                            <sort_order>22</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                        </search_separator>
                         <use_layered_navigation_count translate="label comment">
                             <label>Apply Layered Navigation if Search Results are Less Than</label>
                             <frontend_type>text</frontend_type>