an
/
xmlx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #20 from WesTower/master 

Rolled back mistaken bugfix
This commit is contained in:
jimt 2014-01-29 14:35:56 -08:00
parent 3623786eeb 4a541f77a5
commit 745ca85455
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
node.go
View File

@ -396,14 +396,16 @@ func (this *Node) SelectNodesRecursive(namespace, name string) []*Node {
} }
func rec_SelectNodes(cn *Node, namespace, name string, list *[]*Node, recurse bool) { func rec_SelectNodes(cn *Node, namespace, name string, list *[]*Node, recurse bool) {
if (namespace == "*" || cn.Name.Space == namespace) && (name == "*" || cn.Name.Local == name) {
*list = append(*list, cn)
if !recurse {
return
}
}
for _, v := range cn.Children { for _, v := range cn.Children {
if (namespace == "*" || v.Name.Space == namespace) && (name == "*" || v.Name.Local == name) {
*list = append(*list, v)
}
if recurse {
rec_SelectNodes(v, namespace, name, list, recurse) rec_SelectNodes(v, namespace, name, list, recurse)
} }
}
} }
func (this *Node) RemoveNameSpace() { func (this *Node) RemoveNameSpace() {

16
xmlx_test.go
View File

@ -28,7 +28,8 @@ func TestWildcard(t *testing.T) {
return return
} }
list := doc.SelectNode("", "xml").SelectNodes("ns", "*") list := doc.SelectNodes("ns", "*")
if len(list) != 1 { if len(list) != 1 {
t.Errorf("Wrong number of child elements. Expected 1, got %d.", len(list)) t.Errorf("Wrong number of child elements. Expected 1, got %d.", len(list))
return return
@ -93,24 +94,17 @@ func TestNodeSearch(t *testing.T) {
return return
} }
nodes := doc.SelectNodesRecursive("", "item") nodes := doc.SelectNodes("", "item")
if len(nodes) == 0 { if len(nodes) == 0 {
t.Errorf("SelectNodes(): no nodes found.") t.Errorf("SelectNodes(): no nodes found.")
return return
} }
ch := doc.SelectNode("", "channel") ch := doc.SelectNode("", "channel")
// Test that SelectNodes doesn't accidentally do recursive // Test that SelectNodes properly selects multiple nodes
links := ch.SelectNodes("", "link") links := ch.SelectNodes("", "link")
if len(links) != 1 {
t.Errorf("SelectNodes(): Expected 1, Got %d", len(links))
return
}
// Test SelectNodesRecursive does indeed get all of them
links = ch.SelectNodesRecursive("", "link")
if len(links) != 8 { if len(links) != 8 {
t.Errorf("SelectNodesRecursive(): Expected 8, Got %d", len(links)) t.Errorf("SelectNodes(): Expected 8, Got %d", len(links))
return return
} }
} }