fixed #96

Author: zhengchun

parse.go

@@ -105,13 +105,15 @@ func (p *parser) parse() (*Node, error) {
 				p.prev = node
 			}
 			// https://www.w3.org/TR/xml-names/#scoping-defaulting
-			var defaultNameSpace string
+			var defaultNamespaceURL string
 			for _, att := range tok.Attr {
 				if att.Name.Local == "xmlns" {
-					p.space2prefix[att.Value] = ""
-					defaultNameSpace = att.Value
+					p.space2prefix[att.Value] = "" // reset empty if exist the default namespace
+					defaultNamespaceURL = att.Value
 				} else if att.Name.Space == "xmlns" {
-					p.space2prefix[att.Value] = att.Name.Local
+					if _, ok := p.space2prefix[att.Value]; !ok {
+						p.space2prefix[att.Value] = att.Name.Local
+					}
 				}
 			}
 
@@ -135,17 +137,13 @@ func (p *parser) parse() (*Node, error) {
 			}
 
 			node := &Node{
-				Type: ElementNode,
-				Data: tok.Name.Local,
-				//Prefix:       p.space2prefix[tok.Name.Space],
+				Type:         ElementNode,
+				Data:         tok.Name.Local,
 				NamespaceURI: tok.Name.Space,
 				Attr:         attributes,
 				level:        p.level,
 			}
-			// https://github.com/antchfx/xmlquery/issues/96
-			if !(tok.Name.Space == defaultNameSpace) {
-				node.Prefix = p.space2prefix[tok.Name.Space]
-			}
+
 			if p.level == p.prev.level {
 				AddSibling(p.prev, node)
 			} else if p.level > p.prev.level {
@@ -156,6 +154,14 @@ func (p *parser) parse() (*Node, error) {
 				}
 				AddSibling(p.prev.Parent, node)
 			}
+			if node.NamespaceURI != "" {
+				node.Prefix = p.space2prefix[node.NamespaceURI]
+				if defaultNamespaceURL != "" && node.NamespaceURI == defaultNamespaceURL {
+					node.Prefix = ""
+				} else if n := node.Parent; n != nil && node.NamespaceURI == n.NamespaceURI {
+					node.Prefix = n.Prefix
+				}
+			}
 			// If we're in the streaming mode, we need to remember the node if it is the target node
 			// so that when we finish processing the node's EndElement, we know how/what to return to
 			// caller. Also we need to remove the target node from the tree upon next Read() call so

parse_test.go

@@ -89,6 +89,56 @@ func TestLoadURLFailure(t *testing.T) {
 	}
 }
 
+func TestDefaultNamespace_1(t *testing.T) {
+	s := `<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+	<svg
+	   xmlns:svg="http://www.w3.org/2000/svg"
+	   xmlns="http://www.w3.org/2000/svg"
+	>
+	   <text xml:space="preserve">
+		  <tspan>Multiline</tspan>
+		  <tspan>Multiline text</tspan>
+	   </text>
+	</svg>`
+
+	doc, err := Parse(strings.NewReader(s))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if n := FindOne(doc, "//svg"); n == nil {
+		t.Fatal("should find a `svg` but got nil")
+	}
+	list := Find(doc, "//tspan")
+	if found, expected := len(list), 2; found != expected {
+		t.Fatalf("should found %d tspan but found %d", expected, found)
+	}
+}
+
+func TestDefaultNamespace_2(t *testing.T) {
+	s := `<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+	<svg
+	   xmlns="http://www.w3.org/2000/svg"
+	   xmlns:svg="http://www.w3.org/2000/svg"
+	>
+	   <text xml:space="preserve">
+		  <tspan>Multiline</tspan>
+		  <tspan>Multiline text</tspan>
+	   </text>
+	</svg>`
+
+	doc, err := Parse(strings.NewReader(s))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if n := FindOne(doc, "//svg"); n == nil {
+		t.Fatal("should find a `svg` but got nil")
+	}
+	list := Find(doc, "//tspan")
+	if found, expected := len(list), 2; found != expected {
+		t.Fatalf("should found %d tspan but found %d", expected, found)
+	}
+}
+
 func TestNamespaceURL(t *testing.T) {
 	s := `
 <?xml version="1.0"?>