Merge pull request #305 from PowerKiKi/fix_SUMIF_condition_including_double_quote
Double quote support for SUMIF() condition
This commit is contained in:
commit
0322690991
|
@ -316,7 +316,12 @@ class PHPExcel_Calculation_Functions {
|
|||
} else {
|
||||
preg_match('/([<>=]+)(.*)/',$condition,$matches);
|
||||
list(,$operator,$operand) = $matches;
|
||||
if (!is_numeric($operand)) { $operand = PHPExcel_Calculation::_wrapResult(strtoupper($operand)); }
|
||||
|
||||
if (!is_numeric($operand)) {
|
||||
$operand = str_replace('"', '""', $operand);
|
||||
$operand = PHPExcel_Calculation::_wrapResult(strtoupper($operand));
|
||||
}
|
||||
|
||||
return $operator.$operand;
|
||||
}
|
||||
} // function _ifCondition()
|
||||
|
|
|
@ -521,7 +521,7 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
|
|||
array('"text with quotes"'),
|
||||
array(2),
|
||||
),
|
||||
'=""text with quotes""',
|
||||
'="text with quotes"',
|
||||
array(
|
||||
array(10),
|
||||
array(100),
|
||||
|
@ -533,13 +533,25 @@ class MathTrigTest extends PHPUnit_Framework_TestCase
|
|||
array('"text with quotes"'),
|
||||
array(''),
|
||||
),
|
||||
'>""', // Compare to the single characater " (double quote)
|
||||
'>"', // Compare to the single characater " (double quote)
|
||||
array(
|
||||
array(10),
|
||||
array(100),
|
||||
),
|
||||
10
|
||||
),
|
||||
array(
|
||||
array(
|
||||
array(''),
|
||||
array('anything'),
|
||||
),
|
||||
'>"', // Compare to the single characater " (double quote)
|
||||
array(
|
||||
array(10),
|
||||
array(100),
|
||||
),
|
||||
100
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue