jgaunt/ImportExcel
1
0
Fork 0
mirror of https://github.com/dfinke/ImportExcel.git synced 2026-01-06 10:33:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved tests for emtpy rows after TopRow x

Browse Source
This commit is contained in:
DarkLite1
2017-09-11 14:06:45 +02:00
parent 323c52a24b
commit d75350c659
2 changed files with 151 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ImportExcel.psm1
View File

@@ -331,19 +331,17 @@ Function Import-Excel {
throw "Worksheet '$WorksheetName' not found, the workbook only contains the worksheets '$($Excel.Workbook.Worksheets)'."
}
if (-not $Worksheet.Dimension.Rows) {
Write-Warning "Worksheet '$WorksheetName' in workbook '$Path' is empty"
#region Set the top row
if (((-not ($NoHeader -or $HeaderName)) -and ($TopRow -eq 0))) {
$TopRow = 1
}
#endregion
if (-not ($AllCells = $Worksheet.Cells | where {($_.Start.Row -ge $TopRow)})) {
Write-Warning "Worksheet '$WorksheetName' in workbook '$Path' is empty after TopRow '$TopRow'"
}
else {
#region Set the top row
if (((-not ($NoHeader -or $HeaderName)) -and ($TopRow -eq 0))) {
$TopRow = 1
}
#endregion
#region Collect all cells that contain data starting from the top row
$AllCells = $Worksheet.Cells | where {($_.Start.Row -ge $TopRow)}
#region Get rows and columns
if ($DataOnly) {
$CellsWithValues = $AllCells | where {$_.Value}
@@ -360,7 +358,7 @@ Function Import-Excel {
#endregion
#region Create property names
if (-not ($PropertyNames = Get-PropertyNames -Columns $Columns -TopRow $TopRow)) {
if ((-not $Columns) -or (-not ($PropertyNames = Get-PropertyNames -Columns $Columns -TopRow $TopRow))) {
throw "No column headers found on top row '$TopRow'. If column headers in the worksheet are not a requirement then please use the '-NoHeader' or '-HeaderName' parameter."
}