jgaunt/ImportExcel
1
0
Fork 0
mirror of https://github.com/dfinke/ImportExcel.git synced 2025-12-11 13:53:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweaked spelling

Browse Source
This commit is contained in:
dfinke
2021-11-20 15:53:23 -05:00
parent 6cd9fad7ba
commit 536cdaa841
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Public/Import-Excel.ps1
View File

@@ -68,7 +68,7 @@
# Check $ImportColumns # Check $ImportColumns
if ($ImportColumns[0] -le 0) { throw "The first entry in ImportColumns must be equal or greater 1" ; return } if ($ImportColumns[0] -le 0) { throw "The first entry in ImportColumns must be equal or greater 1" ; return }
# Check $StartColumn and $EndColumn # Check $StartColumn and $EndColumn
if (($StartColumn -ne 1) -or ($EndColumn -ne $end)) { Write-Warning -Message "If ImportColumns is set than individual StartColumn and EndColumn will be ignored." } if (($StartColumn -ne 1) -or ($EndColumn -ne $end)) { Write-Warning -Message "If ImportColumns is set, then individual StartColumn and EndColumn will be ignored." }
# Replace $Columns with $ImportColumns # Replace $Columns with $ImportColumns
$Columns = $ImportColumns $Columns = $ImportColumns
} }
@@ -95,7 +95,7 @@
foreach ($C in $Columns) { foreach ($C in $Columns) {
#allow "False" or "0" to be column headings #allow "False" or "0" to be column headings
$Worksheet.Cells[$StartRow, $C] | Where-Object {-not [string]::IsNullOrEmpty($_.Value) } | Select-Object @{N = 'Column'; E = { $C } }, Value $Worksheet.Cells[$StartRow, $C] | Where-Object { -not [string]::IsNullOrEmpty($_.Value) } | Select-Object @{N = 'Column'; E = { $C } }, Value
} }
} }
} }
@@ -196,7 +196,7 @@
} }
$TextColRegEx = New-Object -TypeName regex -ArgumentList $TextColExpression , 9 $TextColRegEx = New-Object -TypeName regex -ArgumentList $TextColExpression , 9
} }
else {$TextColRegEx = $null} else { $TextColRegEx = $null }
foreach ($R in $rows) { foreach ($R in $rows) {
#Disabled write-verbose for speed #Disabled write-verbose for speed
# Write-Verbose "Import row '$R'" # Write-Verbose "Import row '$R'"
@@ -205,12 +205,12 @@
foreach ($P in $PropertyNames) { foreach ($P in $PropertyNames) {
$MatchTest = $TextColRegEx.Match($P.value) $MatchTest = $TextColRegEx.Match($P.value)
if ($MatchTest.groups.name -eq "astext") { if ($MatchTest.groups.name -eq "astext") {
$NewRow[$P.Value] = $Worksheet.Cells[$R, $P.Column].Text $NewRow[$P.Value] = $Worksheet.Cells[$R, $P.Column].Text
} }
elseif ($MatchTest.groups.name -eq "asdate" -and $Worksheet.Cells[$R, $P.Column].Value -is [System.ValueType]) { elseif ($MatchTest.groups.name -eq "asdate" -and $Worksheet.Cells[$R, $P.Column].Value -is [System.ValueType]) {
$NewRow[$P.Value] = [datetime]::FromOADate(($Worksheet.Cells[$R, $P.Column].Value)) $NewRow[$P.Value] = [datetime]::FromOADate(($Worksheet.Cells[$R, $P.Column].Value))
} }
else { $NewRow[$P.Value] = $Worksheet.Cells[$R, $P.Column].Value } else { $NewRow[$P.Value] = $Worksheet.Cells[$R, $P.Column].Value }
} }
} }
else { else {