[TASK] Remove for now the new feature "withBooleanQuery" (#143)

Author: kszymukowicz

Classes/Filter/SearchFilter.php

@@ -36,7 +36,7 @@ public static function getOpenApiParameters(ApiFilter $apiFilter): array
      */
     public function filterProperty(
         string $property,
-               $values,
+        $values,
         QueryInterface $query,
         ApiFilter $apiFilter
     ): ?ConstraintInterface {
@@ -82,7 +82,6 @@ protected function matchAgainstFindIds(
         $binds = [];
         $rootAlias = 'o';
         $queryExpansion = (bool)$apiFilter->getArgument('withQueryExpansion');
-        $booleanQuery = (bool)$apiFilter->getArgument('withBooleanQuery');
 
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable($tableName);
@@ -101,43 +100,16 @@ protected function matchAgainstFindIds(
 
         foreach ($values as $i => $value) {
             $key = ':text_ma_' . ((int)$i);
-
-            if ($booleanQuery) {
-                // Split the value into individual words and create OR conditions
-                $words = explode(' ', trim($value));
-                $booleanQuery = '';
-                foreach ($words as $word) {
-                    if (!empty(trim($word))) {
-                        $booleanQuery .= ' +'. trim($word) . '* ';
-                    }
-                }
-                $booleanQuery = trim($booleanQuery);
-
-                // use IN BOOLEAN MODE to search for partials of words
-                $conditions[] = sprintf(
-                    'MATCH(%s) AGAINST (%s IN BOOLEAN MODE)',
-                    $queryBuilder->quoteIdentifier(
-                        $tableAlias . '.' . GeneralUtility::makeInstance(DataMapper::class)
-                            ->convertPropertyNameToColumnName($propertyName, $apiFilter->getFilterClass())
-                    ),
-                    $key
-                );
-
-                $binds[ltrim($key, ':')] = $booleanQuery;
-            } else {
-                // Original natural language mode query
-                $conditions[] = sprintf(
-                    'MATCH(%s) AGAINST (%s IN NATURAL LANGUAGE MODE %s)',
-                    $queryBuilder->quoteIdentifier(
-                        $tableAlias . '.' . GeneralUtility::makeInstance(DataMapper::class)
-                            ->convertPropertyNameToColumnName($propertyName, $apiFilter->getFilterClass())
-                    ),
-                    $key,
-                    $queryExpansion ? ' WITH QUERY EXPANSION ' : ''
-                );
-
-                $binds[ltrim($key, ':')] = $value;
-            }
+            $conditions[] = sprintf(
+                'MATCH(%s) AGAINST (%s IN NATURAL LANGUAGE MODE %s)',
+                $queryBuilder->quoteIdentifier(
+                    $tableAlias . '.' . GeneralUtility::makeInstance(DataMapper::class)
+                        ->convertPropertyNameToColumnName($propertyName, $apiFilter->getFilterClass())
+                ),
+                $key,
+                $queryExpansion ? ' WITH QUERY EXPANSION ' : ''
+            );
+            $binds[ltrim($key, ':')] = $value;
         }
 
         return $queryBuilder