Applied ReadFilter option to OOCalc and Excel2003XML Readers, plus additional tests in the /Tests directory

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@60573 2327b42d-5241-43d6-9e2a-de5ac946f064

Classes/PHPExcel/Reader/Excel2003XML.php

@@ -325,43 +325,45 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 		$namespaces = $xml->getNamespaces(true);
 
 		$docProps = $objPHPExcel->getProperties();
-		foreach($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
+		if (isset($xml->DocumentProperties[0])) {
-			switch ($propertyName) {
+			foreach($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
-				case 'Title' :
+				switch ($propertyName) {
-						$docProps->setTitle($propertyValue);
+					case 'Title' :
-						break;
+							$docProps->setTitle($propertyValue);
-				case 'Subject' :
+							break;
-						$docProps->setSubject($propertyValue);
+					case 'Subject' :
-						break;
+							$docProps->setSubject($propertyValue);
-				case 'Author' :
+							break;
-						$docProps->setCreator($propertyValue);
+					case 'Author' :
-						break;
+							$docProps->setCreator($propertyValue);
-				case 'Created' :
+							break;
-						$creationDate = strtotime($propertyValue);
+					case 'Created' :
-						$docProps->setCreated($creationDate);
+							$creationDate = strtotime($propertyValue);
-						break;
+							$docProps->setCreated($creationDate);
-				case 'LastAuthor' :
+							break;
-						$docProps->setLastModifiedBy($propertyValue);
+					case 'LastAuthor' :
-						break;
+							$docProps->setLastModifiedBy($propertyValue);
-				case 'LastSaved' :
+							break;
-						$lastSaveDate = strtotime($propertyValue);
+					case 'LastSaved' :
-						$docProps->setModified($lastSaveDate);
+							$lastSaveDate = strtotime($propertyValue);
-						break;
+							$docProps->setModified($lastSaveDate);
-				case 'Company' :
+							break;
-						$docProps->setCompany($propertyValue);
+					case 'Company' :
-						break;
+							$docProps->setCompany($propertyValue);
-				case 'Category' :
+							break;
-						$docProps->setCategory($propertyValue);
+					case 'Category' :
-						break;
+							$docProps->setCategory($propertyValue);
-				case 'Manager' :
+							break;
-						$docProps->setManager($propertyValue);
+					case 'Manager' :
-						break;
+							$docProps->setManager($propertyValue);
-				case 'Keywords' :
+							break;
-						$docProps->setKeywords($propertyValue);
+					case 'Keywords' :
-						break;
+							$docProps->setKeywords($propertyValue);
-				case 'Description' :
+							break;
-						$docProps->setDescription($propertyValue);
+					case 'Description' :
-						break;
+							$docProps->setDescription($propertyValue);
+							break;
+				}
 			}
 		}
 		if (isset($xml->CustomDocumentProperties)) {
@@ -577,6 +579,12 @@ class PHPExcel_Reader_Excel2003XML implements PHPExcel_Reader_IReader
 					}
 					$cellRange = $columnID.$rowID;
 
+					if (!is_null($this->getReadFilter())) {
+						if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
+							continue;
+						}
+					}
+
 					if ((isset($cell_ss['MergeAcross'])) || (isset($cell_ss['MergeDown']))) {
 						$columnTo = $columnID;
 						if (isset($cell_ss['MergeAcross'])) {

Classes/PHPExcel/Reader/OOCalc.php

@@ -262,8 +262,6 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 					$officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
 				}
 				foreach($officePropertyDC as $propertyName => $propertyValue) {
-//					echo $propertyName.' = '.$propertyValue.'<hr />';
-
 					switch ($propertyName) {
 						case 'title' :
 								$docProps->setTitle($propertyValue);
@@ -291,13 +289,6 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 				}
 				foreach($officePropertyMeta as $propertyName => $propertyValue) {
 					$propertyValueAttributes = $propertyValue->attributes($namespacesMeta['meta']);
-
-//					echo $propertyName.' = '.$propertyValue.'<br />';
-//					foreach ($propertyValueAttributes as $key => $value) {
-//						echo $key.' = '.$value.'<br />';
-//					}
-//					echo '<hr />';
-//
 					switch ($propertyName) {
 						case 'initial-creator' :
 								$docProps->setCreator($propertyValue);
@@ -384,6 +375,12 @@ class PHPExcel_Reader_OOCalc implements PHPExcel_Reader_IReader
 							case 'table-row' :
 								$columnID = 'A';
 								foreach($rowData as $key => $cellData) {
+									if (!is_null($this->getReadFilter())) {
+										if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
+											continue;
+										}
+									}
+
 //									echo '<b>'.$columnID.$rowID.'</b><br />';
 									$cellDataText = $cellData->children($namespacesContent['text']);
 									$cellDataOfficeAttributes = $cellData->attributes($namespacesContent['office']);

Tests/Excel2003XMLReader.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (C) 2006 - 2010 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+/** Error reporting */
+error_reporting(E_ALL);
+
+date_default_timezone_set('Europe/London');
+
+/** PHPExcel_IOFactory */
+require_once '../Classes/PHPExcel/IOFactory.php';
+
+?>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+<title>PHPExcel Excel2003XML Reader Test</title>
+
+</head>
+<body>
+
+<?php
+
+echo date('H:i:s') . " Load from Excel2003XML file\n";
+$callStartTime = microtime(true);
+
+$objReader = PHPExcel_IOFactory::createReader('Excel2003XML');
+$objPHPExcel = $objReader->load("Excel2003XMLTest.xml");
+
+
+$callEndTime = microtime(true);
+$callTime = $callEndTime - $callStartTime;
+echo '<br />Call time to read Workbook was '.sprintf('%.4f',$callTime)." seconds<br />\n";
+// Echo memory usage
+echo date('H:i:s').' Current memory usage: '.(memory_get_usage(true) / 1024 / 1024)." MB<br /><hr />\n";
+
+
+echo date('H:i:s') . " Write to Excel2007 format<br />";
+$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
+$objWriter->save(str_replace('.php', '.xlsx', __FILE__));
+
+
+// Echo memory peak usage
+echo date('H:i:s') . " Peak memory usage: " . (memory_get_peak_usage(true) / 1024 / 1024) . " MB<br />";
+
+// Echo done
+echo date('H:i:s') . " Done writing file.<br />";
+
+?>
+<body>
+</html>

Tests/GnumericReader.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * PHPExcel
+ *
+ * Copyright (C) 2006 - 2010 PHPExcel
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel
+ * @copyright  Copyright (c) 2006 - 2010 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
+ * @version    ##VERSION##, ##DATE##
+ */
+
+/** Error reporting */
+error_reporting(E_ALL);
+
+date_default_timezone_set('Europe/London');
+
+/** PHPExcel_IOFactory */
+require_once '../Classes/PHPExcel/IOFactory.php';
+
+?>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+<title>PHPExcel Gnumeric Reader Test</title>
+
+</head>
+<body>
+
+<?php
+
+echo date('H:i:s') . " Load from Gnumeric file\n";
+$callStartTime = microtime(true);
+
+$objReader = PHPExcel_IOFactory::createReader('Gnumeric');
+$objPHPExcel = $objReader->load("GnumericTest.gnumeric");
+
+
+$callEndTime = microtime(true);
+$callTime = $callEndTime - $callStartTime;
+echo '<br />Call time to read Workbook was '.sprintf('%.4f',$callTime)." seconds<br />\n";
+// Echo memory usage
+echo date('H:i:s').' Current memory usage: '.(memory_get_usage(true) / 1024 / 1024)." MB<br /><hr />\n";
+
+
+echo date('H:i:s') . " Write to Excel2007 format<br />";
+$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
+$objWriter->save(str_replace('.php', '.xlsx', __FILE__));
+
+
+// Echo memory peak usage
+echo date('H:i:s') . " Peak memory usage: " . (memory_get_peak_usage(true) / 1024 / 1024) . " MB<br />";
+
+// Echo done
+echo date('H:i:s') . " Done writing file.<br />";
+
+?>
+<body>
+</html>

Tests/OOCalcReader.php

@@ -33,17 +33,43 @@ date_default_timezone_set('Europe/London');
 /** PHPExcel_IOFactory */
 require_once '../Classes/PHPExcel/IOFactory.php';
 
+?>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
-echo date('H:i:s') . " Load from Open Office Calc file\n";
+<title>PHPExcel OOCalc Reader Test</title>
-$objPHPExcel = PHPExcel_IOFactory::load("OOCalcTest.ods");
 
-echo date('H:i:s') . " Write to Excel2007 format\n";
+</head>
+<body>
+
+<?php
+
+echo date('H:i:s') . " Load from OOCalc file\n";
+$callStartTime = microtime(true);
+
+$objReader = PHPExcel_IOFactory::createReader('OOCalc');
+$objPHPExcel = $objReader->load("OOCalcTest.ods");
+
+
+$callEndTime = microtime(true);
+$callTime = $callEndTime - $callStartTime;
+echo '<br />Call time to read Workbook was '.sprintf('%.4f',$callTime)." seconds<br />\n";
+// Echo memory usage
+echo date('H:i:s').' Current memory usage: '.(memory_get_usage(true) / 1024 / 1024)." MB<br /><hr />\n";
+
+
+echo date('H:i:s') . " Write to Excel2007 format<br />";
 $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
 $objWriter->save(str_replace('.php', '.xlsx', __FILE__));
 
 
 // Echo memory peak usage
-echo date('H:i:s') . " Peak memory usage: " . (memory_get_peak_usage(true) / 1024 / 1024) . " MB\r\n";
+echo date('H:i:s') . " Peak memory usage: " . (memory_get_peak_usage(true) / 1024 / 1024) . " MB<br />";
 
 // Echo done
-echo date('H:i:s') . " Done writing file.\r\n";
+echo date('H:i:s') . " Done writing file.<br />";
+
+?>
+<body>
+</html>