Rewrite xmltools.innerText
Make it recursive, define for node types other than xnElement
This commit is contained in:
parent
5c46f26880
commit
6bd86f7543
2 changed files with 35 additions and 9 deletions
|
|
@ -91,13 +91,25 @@ proc rawTag*(n: XmlNode): string {.inline.} =
|
|||
shallowCopy(result, n.fTag)
|
||||
|
||||
proc innerText*(n: XmlNode): string =
|
||||
## gets the inner text of `n`. `n` has to be an ``xnElement`` node. Only
|
||||
## ``xnText`` and ``xnEntity`` nodes are considered part of `n`'s inner text,
|
||||
## other child nodes are silently ignored.
|
||||
result = ""
|
||||
assert n.k == xnElement
|
||||
for i in 0 .. n.s.len-1:
|
||||
if n.s[i].k in {xnText, xnEntity}: result.add(n.s[i].fText)
|
||||
## gets the inner text of `n`:
|
||||
##
|
||||
## - If `n` is `xnText` or `xnEntity`, returns its content.
|
||||
## - If `n` is `xnElement`, runs recursively on each child node and
|
||||
## concatenates the results.
|
||||
## - Otherwise returns an empty string.
|
||||
var res = ""
|
||||
proc worker(n: XmlNode) =
|
||||
case n.k
|
||||
of { xnText, xnEntity }:
|
||||
res.add(n.fText)
|
||||
of xnElement:
|
||||
for sub in n.s:
|
||||
worker(sub)
|
||||
else:
|
||||
discard
|
||||
|
||||
worker(n)
|
||||
res
|
||||
|
||||
proc tag*(n: XmlNode): string {.inline.} =
|
||||
## gets the tag name of `n`. `n` has to be an ``xnElement`` node.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue