Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

NEW Can filter on string with spaces if search criteria is inside quote.

Browse Source
This commit is contained in:
ldestailleur
2025-02-24 13:43:07 +01:00
parent 607656c08c
commit 28fdefc9a6
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/core/lib/functions.lib.php
View File

@@ -11882,6 +11882,24 @@ function dol_getmypid()
}
/**
* Generate natural SQL search string for a criteria (this criteria can be tested on one or several fields)
*
* @param string $input String to explode
* @return array<string> Array of string values
*/
function dolExplodeKeepIfQuotes($input)
{
// Use regexp to capture words and section in quotes
$matches = array();
preg_match_all('/"([^"]*)"|\'([^\']*)\'|(\S+)/', $input, $matches);
// Merge result and delete empty values
return array_filter(array_map(function ($a, $b, $c) {
return $a ?: ($b ?: $c);
}, $matches[1], $matches[2], $matches[3]));
}
/**
* Generate natural SQL search string for a criteria (this criteria can be tested on one or several fields)
*
@@ -11918,7 +11936,9 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
$value = preg_replace('/\s*\|\s*/', '|', $value);
$crits = explode(' ', $value);
// Split criteria on ' ' but not if we are inside quotes
$crits = dolExplodeKeepIfQuotes($value);
$res = '';
if (!is_array($fields)) {
$fields = array($fields);