Reverted addSearchFilter

Author: ihorvansach

Model/ResourceModel/Post/Collection.php

@@ -386,26 +386,13 @@ public function addSearchFilter($term)
 
         $tagPostIds = array_unique($tagPostIds);
 
-        /* Field => Weigth */
-        $searchFields = [
-            'title' => 3,
-            'content' => 1
-        ];
-        $likeTerm = ['like' => '%' . $term . '%'];
-
-        $formatMatchSql = '0 ';
-        foreach ($searchFields as $field => $fieldWeight) {
-            $formatMatchSql .= '+ FORMAT(MATCH (' . $field . ') AGAINST ('
-                . $this->getConnection()->quote($term)
-                . '), 4) * ' . $fieldWeight . ' ';
-        }
-
         if ($tagPostIdsCount = count($tagPostIds)) {
             $this->addFieldToFilter(
-                array_merge(array_keys($searchFields), ['post_id']),
+                ['title', 'short_content', 'content', 'post_id'],
                 [
-                    $likeTerm,
-                    $likeTerm,
+                    ['like' => '%' . $term . '%'],
+                    ['like' => '%' . $term . '%'],
+                    ['like' => '%' . $term . '%'],
                     ['in' => $tagPostIds]
                 ]
             );
@@ -414,23 +401,29 @@ public function addSearchFilter($term)
                 $tagPostIds = array_slice($tagPostIds, 0, 200);
             }
 
-            $fullExpression = '(' .
-                $formatMatchSql .
+            $fullExpression = '(0 ' .
+                '+ FORMAT(MATCH (title, meta_keywords, meta_description, identifier, content) AGAINST ('
+                . $this->getConnection()->quote($term)
+                . '), 4) ' .
                 '+ IF(main_table.post_id IN (' . implode(',', $tagPostIds) . '), "1", "0"))';
 
             $fullExpression = new \Zend_Db_Expr($fullExpression);
             $this->getSelect()->columns(['search_rate' => $fullExpression]);
             //$this->expressionFieldsToSelect['search_rate'] = $fullExpression;
         } else {
             $this->addFieldToFilter(
-                array_keys($searchFields),
+                ['title', 'short_content', 'content'],
                 [
-                    $likeTerm,
-                    $likeTerm
+                    ['like' => '%' . $term . '%'],
+                    ['like' => '%' . $term . '%'],
+                    ['like' => '%' . $term . '%']
                 ]
             );
 
-            $fullExpression = '(' . $formatMatchSql . ')';
+            $fullExpression = '(0 ' .
+                '+ FORMAT(MATCH (title, meta_keywords, meta_description, identifier, content) AGAINST ('
+                . $this->getConnection()->quote($term)
+                . '), 4))';
 
             $fullExpression = new \Zend_Db_Expr($fullExpression);
             $this->getSelect()->columns(['search_rate' => $fullExpression]);
@@ -740,4 +733,4 @@ public function setOrder($field, $direction = self::SORT_ORDER_DESC)
         }
         return $this;
     }
-}
+}