Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kszymukowicz merged 1 commit into from
Aug 16, 2025
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 11 additions & 39 deletions Classes/Filter/SearchFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static function getOpenApiParameters(ApiFilter $apiFilter): array
*/
public function filterProperty(
string $property,
$values,
$values,
QueryInterface $query,
ApiFilter $apiFilter
): ?ConstraintInterface {
Expand Down Expand Up @@ -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);
Expand All @@ -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
Expand Down