fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-03 16:51:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

code refining!

Browse source
This commit is contained in:
Min-Soo Kim 2020-12-27 19:44:18 +09:00
parent 1bb569c84b
commit 9e847dadcb
1 changed files with 26 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

66
common/framework/parsers/dbquery/variablebase.php
View file

@ -450,11 +450,7 @@ class VariableBase
$escaped_hyphen = false;
// parse the value (text);
if (strpos ($value, '"') !== false)
{
$escaped_quot = true;
$value = str_replace('"', '"', $value);
}
$value = str_replace('"', '"', $value);
$keywords = preg_split('/(\([^\)]*\))|(\-?"[^"]*")|[\s,]+/', trim($value), 10, \PREG_SPLIT_NO_EMPTY | \PREG_SPLIT_DELIM_CAPTURE);
$conditions = array();
$operators = array('AND', 'OR', '|');
@ -462,41 +458,19 @@ class VariableBase
foreach ($keywords as $item)
{
// treat parenthesis
if (strlen($item) > 2 && substr($item, 0, 1) === '(' && substr($item, -1) === ')')
if (substr($item, 0, 1) === '(' && substr($item, -1) === ')')
{
$parsed_keywords = $this->_parseSearchKeywords($column, substr($item, 1, -1));
$conditions[] = $parsed_keywords[0];
$conditions[] = 'AND';
$params = array_merge($params, $parsed_keywords[1]);
continue;
}
// trim quotation mark
if (strlen($item) > 2 && (substr($item, 0, 1) === substr($item, -1)) && substr($item, -1) === '"')
{
$item = substr($item, 1, -1);
if (substr($item, 0, 1) === '-')
$item = trim(substr($item, 1, -1));
if ( $item !== "" )
{
$escaped_hyphen = true;
$parsed_keywords = $this->_parseSearchKeywords($column, substr($item, 1, -1));
$conditions[] = $parsed_keywords[0];
$conditions[] = 'AND';
$params = array_merge($params, $parsed_keywords[1]);
}
}
elseif (strlen($item) > 3 && (substr($item, 0, 1) === '-') && (substr($item, 1, 1) === substr($item, -1)) && substr($item, -1) === '"')
{
$item = '-' . substr($item, 2, -1);
}
// pass blank text
if (trim($item) === "")
{
continue;
}
if($escaped_quot === true)
{
$value = str_replace('"', '"', $value);
$escaped_quot = false;
}
// process 'AND' or 'OR' operator
if (in_array($item, $operators))
{
@ -505,16 +479,13 @@ class VariableBase
$item = 'OR';
}
// remove the last point (would be an operator)
$last_condition = array_pop($conditions);
// the last condition might not be an operator.
if (!in_array($last_condition, $operators))
{
$conditions[] = $last_condition;
}
array_pop($conditions);
$conditions[] = $item;
}
else
{
$value = str_replace('"', '"', $value);
if (substr($item, 0, 1) === '-' && $escaped_hyphen !== true)
{
$conditions[] = sprintf('%s NOT LIKE ?', $column);
@ -524,6 +495,21 @@ class VariableBase
{
$conditions[] = sprintf('%s LIKE ?', $column);
}
// trim quotation mark
if (substr($item, 0, 6) === substr($item, -6) && substr($item, -6) === '"')
{
$item = substr($item, 6, -6);
}
// pass blank text
if (trim($item) === "")
{
array_pop($conditions);
continue;
}
$params[] = '%' . str_replace(['\\', '_', '%'], ['\\\\', '\_', '\%'], $item) . '%';
// if there is no operator, assume 'AND'
$conditions[] = 'AND';