Merge pull request #6 from davidanthoff/fix-skipstartrows-etc

Fix bug related to skipstartrows etc.
queryverse · May 17, 2018 · 2d44233 · 2d44233
2 parents bd0089e + 7d63166
commit 2d44233
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,6 @@
+# ExcelFiles.jl v0.3.1
+* Fix bug related to skipstartrows etc.
+
 # ExcelFiles.jl v0.3.0
 * Incorporate all table functionality from ExcelReaders.jl.
 * Drop dependency on DataTables.jl and DataFrames.jl.

diff --git a/src/ExcelFiles.jl b/src/ExcelFiles.jl
@@ -93,7 +93,10 @@ function IteratorInterfaceExtensions.getiterator(file::ExcelFile)
         sheet = excelfile.workbook[:sheet_by_name](file.range)
         startrow, startcol, endrow, endcol = ExcelReaders.convert_args_to_row_col(sheet; file.keywords...)
 
-        _readxl(excelfile, file.range, startrow, startcol, endrow, endcol; file.keywords...)    
+        keywords2 = copy(file.keywords)
+        keywords2 = filter(i->!(i[1] in (:skipstartrows, :skipstartcols, :nrows, :ncols)), file.keywords)
+
+        _readxl(excelfile, file.range, startrow, startcol, endrow, endcol; keywords2...)    
     end
 
     return create_tableiterator(column_data, col_names)