Merge pull request nuovo#36 from pilsetnieks/master

Bugfix for when the row count cannot be read from XLS file

Author: pilsetnieks

CHANGELOG.md

@@ -1,3 +1,7 @@
+### v.0.5.2  2013-06-28
+
+- A fix for the case when row count wasn't read correctly from the sheet in a XLS file.
+
 ### v.0.5.1  2013-06-27
 
 - Fixed file type choice when using mime-types (previously there were problems with  

SpreadsheetReader.php

@@ -2,7 +2,7 @@
 /**
  * Main class for spreadsheet reading
  *
- * @version 0.5.1
+ * @version 0.5.2
  * @author Martins Pilsetnieks
  */
 	class SpreadsheetReader implements Iterator, Countable

SpreadsheetReader_XLS.php

@@ -37,9 +37,14 @@ class SpreadsheetReader_XLS implements Iterator, Countable
 		private $CurrentRow = array();
 
 		/**
-		 * @var int Column count in the file
+		 * @var int Column count in the sheet
 		 */
 		private $ColumnCount = 0;
+		/**
+		 * @var int Row count in the sheet
+		 */
+		private $RowCount = 0;
+
 		/**
 		 * @var array Template to use for empty rows. Retrieved rows are merged
 		 *	with this so that empty cells are added, too
@@ -119,6 +124,15 @@ public function ChangeSheet($Index)
 				$this -> CurrentSheet = $Index;
 
 				$this -> ColumnCount = $this -> Handle -> sheets[$this -> CurrentSheet]['numCols'];
+				$this -> RowCount = $this -> Handle -> sheets[$this -> CurrentSheet]['numRows'];
+
+				// For the case when Spreadsheet_Excel_Reader doesn't have the row count set correctly.
+				if (!$this -> RowCount && count($this -> Handle -> sheets[$this -> CurrentSheet]['cells']))
+				{
+					end($this -> Handle -> sheets[$this -> CurrentSheet]['cells']);
+					$this -> RowCount = (int)key($this -> Handle -> sheets[$this -> CurrentSheet]['cells']);
+				}
+
 				$this -> EmptyRow = array_fill(1, $this -> ColumnCount, '');
 			}
 
@@ -221,7 +235,7 @@ public function valid()
 			{
 				return false;
 			}
-			return ($this -> Index <= $this -> Handle -> sheets[$this -> CurrentSheet]['numRows']);
+			return ($this -> Index <= $this -> RowCount);
 		}
 
 		// !Countable interface method
@@ -236,7 +250,7 @@ public function count()
 				return 0;
 			}
 
-			return $this -> Handle -> sheets[$this -> CurrentSheet]['numRows'];
+			return $this -> RowCount;
 		}
 	}
 ?>