Namespace lookup should be based on declarations in scope

Author: jbowtie

xslt/context.go

@@ -68,14 +68,34 @@ func (context *ExecutionContext) EvalXPath(xmlNode xml.Node, data interface{}) (
 //TODO: walk up tree to get all namespaces in scope
 // libxml probably already makes this info available
 func (context *ExecutionContext) RegisterXPathNamespaces(node xml.Node) (err error) {
-	for _, decl := range node.DeclaredNamespaces() {
-		context.XPathContext.RegisterNamespace(decl.Prefix, decl.Uri)
+	seen := make(map[string]bool)
+	for n := node; n != nil; n = n.Parent() {
+		for _, decl := range n.DeclaredNamespaces() {
+			alreadySeen, _ := seen[decl.Prefix]
+			if !alreadySeen {
+				context.XPathContext.RegisterNamespace(decl.Prefix, decl.Uri)
+				seen[decl.Prefix] = true
+			}
+		}
 	}
 	return
 }
 
 // Attempt to map a prefix to a URI.
-func (context *ExecutionContext) LookupNamespace(prefix string) (uri string) {
+func (context *ExecutionContext) LookupNamespace(prefix string, node xml.Node) (uri string) {
+	//if given a context node, see if the prefix is in scope
+	if node != nil {
+		for n := node; n != nil; n = n.Parent() {
+			for _, decl := range n.DeclaredNamespaces() {
+				if decl.Prefix == prefix {
+					return decl.Uri
+				}
+			}
+		}
+		return
+	}
+
+	//if no context node, simply check the stylesheet map
 	for href, pre := range context.Style.NamespaceMapping {
 		if pre == prefix {
 			return href

xslt/match.go

@@ -390,7 +390,13 @@ func (m *CompiledMatch) EvalMatch(node xml.Node, mode string, context *Execution
 				return false
 			}
 		case OP_NS:
-			uri := context.LookupNamespace(step.Value)
+			uri := ""
+			// m.Template.Node
+			if m.Template != nil {
+				uri = context.LookupNamespace(step.Value, m.Template.Node)
+			} else {
+				uri = context.LookupNamespace(step.Value, nil)
+			}
 			if uri != cur.Namespace() {
 				return false
 			}

xslt/stylesheet.go

@@ -596,7 +596,7 @@ func (style *Stylesheet) ParseTemplate(node xml.Node) {
 	}
 
 	// TODO: validate the name (duplicate should raise error)
-	template := &Template{Match: match, Mode: mode, Name: name, Priority: p}
+	template := &Template{Match: match, Mode: mode, Name: name, Priority: p, Node: node}
 
 	template.CompileContent(node)
 

xslt/template.go

@@ -19,6 +19,7 @@ type Template struct {
 	Match    string
 	Priority float64
 	Children []CompiledStep
+	Node     xml.Node
 }
 
 type XsltInstruction struct {
@@ -145,9 +146,13 @@ func (i *XsltInstruction) Apply(node xml.Node, context *ExecutionContext) {
 			context.XPathContext.SetContextPosition(oldpos, oldtotal)
 			return
 		}
+		context.RegisterXPathNamespaces(i.Node)
 		e := xpath.Compile(scope)
 		// TODO: ensure we apply strip-space if required
-		nodes, _ := context.EvalXPathAsNodeset(node, e)
+		nodes, err := context.EvalXPathAsNodeset(node, e)
+		if err != nil {
+			fmt.Println("apply-templates @select", err)
+		}
 		if i.sorting != nil {
 			i.Sort(nodes, context)
 		}
@@ -260,7 +265,7 @@ func (i *XsltInstruction) Apply(node xml.Node, context *ExecutionContext) {
 
 	case "value-of":
 		e := xpath.Compile(i.Node.Attr("select"))
-		context.RegisterXPathNamespaces(i.Node.MyDocument().Root())
+		context.RegisterXPathNamespaces(i.Node)
 		o, _ := context.EvalXPath(node, e)
 		switch output := o.(type) {
 		case []xml.Node: