alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor performance tweaks 

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@63695 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2010-11-13 23:33:20 +00:00
parent cb382e89f3
commit 51dc3403ff
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Classes/PHPExcel/Calculation.php
View File

@ -1797,7 +1797,7 @@ class PHPExcel_Calculation {
* *
* @param float $pValue * @param float $pValue
*/ */
public function setCalculationCacheExpirationTime($pValue = 2.5) { public function setCalculationCacheExpirationTime($pValue = 15) {
self::$_calculationCacheExpirationTime = $pValue; self::$_calculationCacheExpirationTime = $pValue;
} // function setCalculationCacheExpirationTime() } // function setCalculationCacheExpirationTime()
@ -2208,10 +2208,9 @@ class PHPExcel_Calculation {
$formula = trim($formula); $formula = trim($formula);
if ($formula{0} != '=') return self::_wrapResult($formula); if ($formula{0} != '=') return self::_wrapResult($formula);
$formula = trim(substr($formula,1)); $formula = trim(substr($formula,1));
$formulaLength = strlen($formula); if (strlen($formula) < 1) return self::_wrapResult($formula);
if ($formulaLength < 1) return self::_wrapResult($formula);
$wsTitle = 0x00.'Wrk'; $wsTitle = "\x00Wrk";
if (!is_null($pCell)) { if (!is_null($pCell)) {
$pCellParent = $pCell->getParent(); $pCellParent = $pCell->getParent();
if (!is_null($pCellParent)) { if (!is_null($pCellParent)) {
@ -2248,14 +2247,14 @@ class PHPExcel_Calculation {
} }
} }
if ((in_array($wsTitle.'!'.$cellID,$this->debugLogStack)) && ($wsTitle != 0x00.'Wrk')) { if ((in_array($wsTitle.'!'.$cellID,$this->debugLogStack)) && ($wsTitle != "\x00Wrk")) {
if ($this->cyclicFormulaCount <= 0) { if ($this->cyclicFormulaCount <= 0) {
return $this->_raiseFormulaError('Cyclic Reference in Formula'); return $this->_raiseFormulaError('Cyclic Reference in Formula');
} elseif (($this->_cyclicFormulaCount >= $this->cyclicFormulaCount) && } elseif (($this->_cyclicFormulaCount >= $this->cyclicFormulaCount) &&
($this->_cyclicFormulaCell == $wsTitle.'!'.$cellID)) { ($this->_cyclicFormulaCell == $wsTitle.'!'.$cellID)) {
return $cellValue; return $cellValue;
} elseif ($this->_cyclicFormulaCell == $wsTitle.'!'.$cellID) { } elseif ($this->_cyclicFormulaCell == $wsTitle.'!'.$cellID) {
$this->_cyclicFormulaCount++; ++$this->_cyclicFormulaCount;
if ($this->_cyclicFormulaCount >= $this->cyclicFormulaCount) { if ($this->_cyclicFormulaCount >= $this->cyclicFormulaCount) {
return $cellValue; return $cellValue;
} }
@ -2353,7 +2352,7 @@ class PHPExcel_Calculation {
* @param mixed &$matrix1 First matrix operand * @param mixed &$matrix1 First matrix operand
* @param mixed &$matrix2 Second matrix operand * @param mixed &$matrix2 Second matrix operand
*/ */
private static function _resizeMatricesShrink(&$matrix1,&$matrix2) { private static function _resizeMatricesShrink(&$matrix1,&$matrix2,$matrix1Rows,$matrix1Columns,$matrix2Rows,$matrix2Columns) {
list($matrix1Rows,$matrix1Columns) = self::_getMatrixDimensions($matrix1); list($matrix1Rows,$matrix1Columns) = self::_getMatrixDimensions($matrix1);
list($matrix2Rows,$matrix2Columns) = self::_getMatrixDimensions($matrix2); list($matrix2Rows,$matrix2Columns) = self::_getMatrixDimensions($matrix2);
@ -2806,9 +2805,8 @@ class PHPExcel_Calculation {
} }
} }
} }
$cellRef = strtoupper($val);
$output[] = array('type' => 'Cell Reference', 'value' => $val, 'reference' => $cellRef); $output[] = array('type' => 'Cell Reference', 'value' => $val, 'reference' => $val);
// $expectingOperator = false; // $expectingOperator = false;
} else { // it's a variable, constant, string, number or boolean } else { // it's a variable, constant, string, number or boolean
// echo 'Element is a Variable, Constant, String, Number or Boolean<br />'; // echo 'Element is a Variable, Constant, String, Number or Boolean<br />';
@ -2870,7 +2868,7 @@ class PHPExcel_Calculation {
$index += $length; $index += $length;
} elseif ($opCharacter == '$') { // absolute row or column range } elseif ($opCharacter == '$') { // absolute row or column range
$index++; ++$index;
} elseif ($opCharacter == ')') { // miscellaneous error checking } elseif ($opCharacter == ')') { // miscellaneous error checking
if ($expectingOperand) { if ($expectingOperand) {
$output[] = array('type' => 'Null Value', 'value' => self::$_ExcelConstants['NULL'], 'reference' => NULL); $output[] = array('type' => 'Null Value', 'value' => self::$_ExcelConstants['NULL'], 'reference' => NULL);
@ -3288,9 +3286,9 @@ class PHPExcel_Calculation {
$stack->push('Value',$token); $stack->push('Value',$token);
// if the token is a named range, push the named range name onto the stack // if the token is a named range, push the named range name onto the stack
} elseif (preg_match('/^'.self::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $token, $matches)) { } elseif (preg_match('/^'.self::CALCULATION_REGEXP_NAMEDRANGE.'$/i', $token, $matches)) {
// echo 'Token is a named range<br />'; echo 'Token is a named range<br />';
$namedRange = $matches[6]; $namedRange = $matches[6];
// echo 'Named Range is '.$namedRange.'<br />'; echo 'Named Range is '.$namedRange.'<br />';
$this->_writeDebug('Evaluating Named Range '.$namedRange); $this->_writeDebug('Evaluating Named Range '.$namedRange);
$cellValue = $this->extractNamedRange($namedRange, ((null !== $pCell) ? $pCellParent : null), false); $cellValue = $this->extractNamedRange($namedRange, ((null !== $pCell) ? $pCellParent : null), false);
$pCell->attach($pCellParent); $pCell->attach($pCellParent);

2
Classes/PHPExcel/Writer/CSV.php
View File

@ -248,7 +248,7 @@ class PHPExcel_Writer_CSV implements PHPExcel_Writer_IWriter {
* @throws Exception * @throws Exception
*/ */
private function _writeLine($pFileHandle = null, $pValues = null) { private function _writeLine($pFileHandle = null, $pValues = null) {
if (!is_null($pFileHandle) && is_array($pValues)) { if (is_array($pValues)) {
// No leading delimiter // No leading delimiter
$writeDelimiter = false; $writeDelimiter = false;

4
Classes/PHPExcel/Writer/HTML.php
View File

@ -292,6 +292,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
*/ */
public function writeAllSheets() { public function writeAllSheets() {
$this->_sheetIndex = null; $this->_sheetIndex = null;
return $this;
} }
/** /**
@ -308,8 +309,7 @@ class PHPExcel_Writer_HTML implements PHPExcel_Writer_IWriter {
} }
// Construct HTML // Construct HTML
$html = ''; $html = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' . "\r\n";
$html .= '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' . "\r\n";
$html .= '<!-- Generated by PHPExcel - http://www.phpexcel.net -->' . "\r\n"; $html .= '<!-- Generated by PHPExcel - http://www.phpexcel.net -->' . "\r\n";
$html .= '<html>' . "\r\n"; $html .= '<html>' . "\r\n";
$html .= ' <head>' . "\r\n"; $html .= ' <head>' . "\r\n";