only lookup cells once per row

dfinke · May 20, 2024 · d514047 · d514047
1 parent 84684ae
commit d514047
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/Public/Import-Excel.ps1 b/Public/Import-Excel.ps1
@@ -217,9 +217,15 @@
                             #Disabled write-verbose for speed
                             #  Write-Verbose "Import row '$R'"
                             $NewRow = [Ordered]@{ }
+
+                            # Get the entire row
+                            $rowCells = $sheet.Cells[$R, $StartColumn, $R, $EndColumn].Value
+
+                            $i = 0
+
                             if ($TextColRegEx) {
                                 foreach ($P in $PropertyNames) {
-                                    $cell = $sheet.Cells[$R, $P.Column]
+                                    $cell = $rowCells[0, $i]
                                     $MatchTest = $TextColRegEx.Match($P.value)
                                     if ($MatchTest.groups.name -eq "astext") {
                                         $NewRow[$P.Value] = $cell.Text
@@ -228,12 +234,13 @@
                                         $NewRow[$P.Value] = [datetime]::FromOADate($cell.Value)
                                     }
                                     else { $NewRow[$P.Value] = $cell.Value }
+                                    $i++
                                 }
                             }
                             else {
                                 foreach ($P in $PropertyNames) {
-                                    $NewRow[$P.Value] = $sheet.Cells[$R, $P.Column].Value
-                                    #    Write-Verbose "Import cell '$($Worksheet.Cells[$R, $P.Column].Address)' with property name '$($p.Value)' and value '$($Worksheet.Cells[$R, $P.Column].Value)'."
+                                    $NewRow[$P.Value] = $rowCells[0, $i]
+                                    $i++
                                 }
                             }
                             $xlBook["$targetSheetname"] += [PSCustomObject]$NewRow