Merge pull request #11 from misol/db-search-operator

code refining2
This commit is contained in:
Min-Soo Kim 2020-12-27 19:55:28 +09:00 committed by GitHub
commit d2c362dc24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -456,7 +456,7 @@ class VariableBase
// parse the value (text); // parse the value (text);
$value = str_replace('"', '"', $value); $value = str_replace('"', '"', $value);
$keywords = preg_split('/(\([^\)]*\))|(\-?"[^"]*")|[\s,]+/', trim($value), 10, \PREG_SPLIT_NO_EMPTY | \PREG_SPLIT_DELIM_CAPTURE); $keywords = preg_split('/(\([^\)]*\))|(\-?\"[^\"]*\")|[\s,]+/', trim($value), 10, \PREG_SPLIT_NO_EMPTY | \PREG_SPLIT_DELIM_CAPTURE);
$conditions = array(); $conditions = array();
$operators = array('AND', 'OR', '|'); $operators = array('AND', 'OR', '|');
// loop the parsed keywords or operators // loop the parsed keywords or operators
@ -489,9 +489,9 @@ class VariableBase
} }
else else
{ {
$value = str_replace('"', '"', $value); $item = str_replace('"', '"', $item);
if (substr($item, 0, 1) === '-' && $escaped_hyphen !== true) if (substr($item, 0, 1) === '-')
{ {
$conditions[] = sprintf('%s NOT LIKE ?', $column); $conditions[] = sprintf('%s NOT LIKE ?', $column);
$item = substr($item, 1); $item = substr($item, 1);
@ -505,7 +505,6 @@ class VariableBase
if (substr($item, 0, 6) === substr($item, -6) && substr($item, -6) === '"') if (substr($item, 0, 6) === substr($item, -6) && substr($item, -6) === '"')
{ {
$item = substr($item, 6, -6); $item = substr($item, 6, -6);
} }
// pass blank text // pass blank text