Merge pull request #1695 from scriptingstudio/master

[Get-HtmlTable] XPath optimization

Examples/ConditionalFormatting/ConditionalFormattingUnmatchColumns-Sol2.ps1

@@ -1,27 +0,0 @@
-try { Import-Module $PSScriptRoot\..\..\ImportExcel.psd1 } catch { throw ; return }
-
-$data = ConvertFrom-Csv @"
-Sequence1,StateName1,Abbreviation1,Sequence2,StateName2,Abbreviation2
-A001,Alabama,AL,A001,Alabama,AL
-A002,California,CA,B002,California,CA
-A003,Colorado,CO,A003,Colorado,CO
-A004,Florida,FL,A004,Maine,FL
-A005,Missouri,MO,A005,Missouri,MI
-A006,New Mexico,NM,A006,Tennessee,TN
-A007,North Carolina,NC,C007,North Carolina,NC
-A008,North Dakota,ND,A008,South Dakota,SD
-A009,Rhode Island,RI,D009,Rhode Island,VA
-A010,Texas,TX,A010,Texas,TX
-"@
-
-$xlfile = "$PSScriptRoot\test.xlsx"
-Remove-Item $xlfile -ErrorAction SilentlyContinue
-
-$file = $data | Export-Excel $xlfile -AutoSize -PassThru
-
-Add-ConditionalFormatting -Worksheet $file.Sheet1 -Range '$1:$1' -ConditionValue '=True' -RuleType Expression -StopIfTrue
-Add-ConditionalFormatting -Worksheet $file.Sheet1 -Range '$D:$D' -ConditionValue '=NOT(EXACT($A1,$D1))' -RuleType Expression -ForegroundColor Red
-Add-ConditionalFormatting -Worksheet $file.Sheet1 -Range '$E:$E' -ConditionValue '=NOT(EXACT($B1,$E1))' -RuleType Expression -ForegroundColor Red
-Add-ConditionalFormatting -Worksheet $file.Sheet1 -Range '$F:$F' -ConditionValue '=NOT(EXACT($C1,$F1))' -RuleType Expression -ForegroundColor Red
-
-Close-ExcelPackage $file -Show

ImportExcel.psd1

@@ -6,7 +6,7 @@
     RootModule         = 'ImportExcel.psm1'
 
     # Version number of this module.
-    ModuleVersion      = '7.8.9'
+    ModuleVersion      = '7.8.10'
 
     # ID used to uniquely identify this module
     GUID               = '60dd4136-feff-401a-ba27-a84458c57ede'
@@ -150,7 +150,7 @@ Check out the How To Videos https://www.youtube.com/watch?v=U3Ne_yX4tYo&list=PL5
             Tags         = @("Excel", "EPPlus", "Export", "Import")
 
             # The web address of an icon which can be used in galleries to represent this module
-            #IconUri = "http://pesterbdd.com/images/Pester.png"
+            #IconUri = 
 
             # The web address of this module's project or support homepage.
             ProjectUri   = "https://github.com/dfinke/ImportExcel"
@@ -215,4 +215,4 @@ Check out the How To Videos https://www.youtube.com/watch?v=U3Ne_yX4tYo&list=PL5
     # Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
     # DefaultCommandPrefix = ''
 
-}
+}

Public/Get-HtmlTable.ps1

@@ -50,7 +50,9 @@ function Get-HtmlTable {
     else {
         $h    = ConvertFrom-Html -Content $r.Content
         if ($TableIndex -is [valuetype]) { $TableIndex += 1}
-        $rows =    $h.SelectNodes("//table[$TableIndex]//tr")
+        $rows = try {
+               $h.SelectSingleNode("//table[$TableIndex]").SelectNodes(".//tr")
+        } catch {}
         if (-not $rows) {Write-Warning "Could not find rows for `"//table[$TableIndex]`" in $Url ."}
         if ( -not  $propertyNames) {
             if (   $tableHeaders  = $rows[$FirstDataRow].SelectNodes("th")) {

changelog.md

@@ -1,3 +1,7 @@
+# 7.8.10
+
+- Thank you https://github.com/evenmartinsen for the PR to fix the AV
+
 # 7.8.9
 
 - Thanks to (Edward Miller)[https://github.com/edwardmiller-mesirow] for improving `ConvertTo-ExcelXlsx`and making it more robust