v1.0.83: XPath //:t и //:tr → .//:t и .//:tr — поиск от параграфа, не от корня

This commit is contained in:
2026-06-21 09:24:11 +04:00
parent 192b4ea0e9
commit a214a0d1e6
+4 -4
View File
@@ -170,9 +170,9 @@
<cfif localName EQ "p" OR right(localName, 2) EQ ":p">
<cfset var paraText = "">
<cftry>
<cfset var textNodes = xmlSearch(child, "//:t")>
<cfset var textNodes = xmlSearch(child, ".//:t")>
<cfcatch>
<cfset textNodes = xmlSearch(child, "//*[local-name()='t']")>
<cfset textNodes = xmlSearch(child, ".//*[local-name()='t']")>
</cfcatch>
</cftry>
<cfloop array="#textNodes#" index="tn">
@@ -190,9 +190,9 @@
<cfelseif localName EQ "tbl" OR right(localName, 4) EQ ":tbl">
<cfset var rows = []>
<cftry>
<cfset var trNodes = xmlSearch(child, "//:tr")>
<cfset var trNodes = xmlSearch(child, ".//:tr")>
<cfcatch>
<cfset trNodes = xmlSearch(child, "//*[local-name()='tr']")>
<cfset trNodes = xmlSearch(child, ".//*[local-name()='tr']")>
</cfcatch>
</cftry>
<cfloop array="#trNodes#" index="trNode">