fix for xpath namespace queries

Author: tamerh

element.go

@@ -7,9 +7,11 @@ type XMLElement struct {
 	Childs    map[string][]XMLElement
 	Err       error
 	// filled when xpath enabled
-	childs []*XMLElement
-	parent *XMLElement
-	attrs  []*xmlAttr
+	childs    []*XMLElement
+	parent    *XMLElement
+	attrs     []*xmlAttr
+	localName string
+	prefix    string
 }
 
 type xmlAttr struct {

query.go

@@ -78,12 +78,15 @@ func (x *XmlNodeNavigator) LocalName() string {
 	if x.attr != -1 {
 		return x.curr.attrs[x.attr].name
 	}
-	return x.curr.Name
+
+	return x.curr.localName
 
 }
 
 func (x *XmlNodeNavigator) Prefix() string {
-	return ""
+
+	return x.curr.prefix
+
 }
 
 func (x *XmlNodeNavigator) Value() string {

xmlparser.go

@@ -3,6 +3,7 @@ package xmlparser
 import (
 	"bufio"
 	"fmt"
+	"strings"
 	"unicode/utf8"
 )
 
@@ -340,16 +341,49 @@ func (x *XMLParser) startElement() (*XMLElement, bool, error) {
 
 		if x.isWS(cur) {
 			result.Name = string(x.scratch.bytes())
+
+			if x.xpathEnabled {
+				names := strings.Split(result.Name, ":")
+				if len(names) > 1 {
+					result.prefix = names[0]
+					result.localName = names[1]
+				} else {
+					result.localName = names[0]
+				}
+			}
+
 			x.scratch.reset()
 			goto search_close_tag
 		}
 
 		if cur == '>' {
 			if prev == '/' {
 				result.Name = string(x.scratch.bytes()[:len(x.scratch.bytes())-1])
+
+				if x.xpathEnabled {
+					names := strings.Split(result.Name, ":")
+					if len(names) > 1 {
+						result.prefix = names[0]
+						result.localName = names[1]
+					} else {
+						result.localName = names[0]
+					}
+				}
+
 				return result, true, nil
 			}
 			result.Name = string(x.scratch.bytes())
+
+			if x.xpathEnabled {
+				names := strings.Split(result.Name, ":")
+				if len(names) > 1 {
+					result.prefix = names[0]
+					result.localName = names[1]
+				} else {
+					result.localName = names[0]
+				}
+			}
+
 			return result, false, nil
 		}
 		x.scratch.add(cur)

xmlparser_test.go

@@ -2,6 +2,7 @@ package xmlparser
 
 import (
 	"bufio"
+	"bytes"
 	"fmt"
 	"os"
 	"strings"
@@ -358,6 +359,55 @@ func TestXpath(t *testing.T) {
 	}
 }
 
+func TestXpathNS(t *testing.T) {
+
+	br := bufio.NewReader(bytes.NewReader([]byte(`
+		<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+		<soap:Body>
+			<soap:BodyNest1>
+				<soap:BodyNest2>
+				</soap:BodyNest2>
+			</soap:BodyNest1>
+		</soap:Body>
+
+		<soap:Body>
+		<soap:BodyNest1>
+			<soap:BodyNest3 nestatt3="nestatt3val">
+			</soap:BodyNest3>
+		</soap:BodyNest1>
+	</soap:Body>
+
+		</soap:Envelope>
+	`)))
+
+	str := NewXMLParser(br, "soap:Envelope").EnableXpath()
+	for xml := range str.Stream() {
+
+		if list, err := xml.SelectElements("soap:Body"); len(list) != 2 || err != nil {
+			t.Fatal("soap:Body != 2")
+		}
+
+		if list, err := xml.SelectElements("./soap:Body/soap:BodyNest1"); len(list) != 2 || err != nil {
+			t.Fatal("/soap:Body/soap:BodyNest1 != 2")
+		}
+
+		if list, err := xml.SelectElements("./soap:Body/soap:BodyNest1/soap:BodyNest2"); len(list) != 1 || err != nil {
+			t.Fatal("/soap:Body/soap:BodyNest1/soap:BodyNest2 != 1")
+		}
+
+		list, err := xml.SelectElements("./soap:Body/soap:BodyNest1/soap:BodyNest3")
+		if len(list) != 1 || err != nil {
+			t.Fatal("/soap:Body/soap:BodyNest1/soap:BodyNest3 != 1")
+		}
+
+		if list[0].Attrs["nestatt3"] != "nestatt3val" {
+			t.Fatal("nestatt3 attiribute test failed")
+		}
+
+	}
+
+}
+
 func Benchmark1(b *testing.B) {
 
 	for n := 0; n < b.N; n++ {