Merge pull request #1695 from scriptingstudio/master

[Get-HtmlTable] XPath optimization
2025-12-26 13:13:16 +00:00 · 2025-04-23 08:16:05 -04:00 · 2025-04-23 13:36:32 +03:00 · 2025-04-11 07:10:31 -04:00 · 2025-04-11 06:51:18 -04:00 · 2024-10-21 19:44:36 -04:00
4 changed files with 5602 additions and 4 deletions
--- a/ImportExcel.psd1
+++ b/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 = ''

-}
+}
--- a/Public/Get-HtmlTable.ps1
+++ b/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")) {
--- a/changelog.md
+++ b/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
--- a/llms-examples.txt
+++ b/llms-examples.txt
Author	SHA1	Message	Date
Doug Finke	5387c06146	Merge pull request #1695 from scriptingstudio/master [Get-HtmlTable] XPath optimization	2025-04-23 08:16:05 -04:00
Matthew Gray	45ed6a06dc	[Get-HtmlTable] XPath optimization ```powershell $rows = $h.SelectNodes("//table[$TableIndex]//tr") ``` XPath selector in line 53 uses complex expression that can lead to unexpected result. The problem is that HtmlAgilityPack may have specific issues. In particular, on websites containing multiple tables this selector can find not one table. This is aggravated by the fact that tables can have different structures. To avoid ambiguity this PR suggests to separate queries. Oneliner simplifies error checking ```powershell $rows = try { $h.SelectSingleNode("//table[$TableIndex]").SelectNodes(".//tr") } catch {} if (-not $rows) {Write-Warning "Could not find rows for `"//table[$TableIndex]`" in $Url ."} ``` This expression doesn't even need testing, it just works.	2025-04-23 13:36:32 +03:00
dfinke	fa447a745c	move llms text to root	2025-04-11 07:10:31 -04:00
dfinke	49affcfba7	add llms text of Examples directort for use in LLMs	2025-04-11 06:51:18 -04:00
dfinke	dc4a5e9db9	chore: Update changelog for version 7.8.10 and acknowledge PR contributions	2024-10-21 19:44:36 -04:00
Doug Finke	85e48acf36	Merge pull request #1648 from evenmartinsen/master Remove flagged URL	2024-10-21 19:42:23 -04:00
dfinke	fb41d3de83	chore: Update module version to 7.8.10	2024-10-21 19:39:44 -04:00
dfinke	db84a59dd0	chore: Update module version to 7.8.10	2024-10-21 19:37:58 -04:00
Even Martinsen	5a61c5dda4	Re-add icon variable (Commented) re-added variable for easier modification in the future.	2024-10-21 14:37:55 +02:00
Even Martinsen	a2bc50aeb0	Remove flagged URI Removed due to various AV's flagging the link as malicious thus flagging and quarentining the module.	2024-10-21 14:35:50 +02:00