fix attribute output

spali · Jan 28, 2021 · 6e111d7 · 6e111d7
1 parent 5873934
commit 6e111d7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/xq.go b/xq.go
@@ -123,9 +123,14 @@ func query(reader io.ReadCloser, xpath string) error {
 		return fmt.Errorf("%w: %s", ErrXMLQuery, err)
 	}
 	for _, elem := range list {
-		// prevent output of pseudo tags if root element was selected
-		isRoot := elem.Parent != nil
-		fmt.Printf("%s\n", elem.OutputXML(isRoot))
+		if elem.Type == xmlquery.AttributeNode {
+			// do not nest attribute node in a tag
+			fmt.Printf("%s\n", elem.InnerText())
+		} else {
+			// prevent output of pseudo tags if root element was selected
+			isRoot := elem.Parent != nil
+			fmt.Printf("%s\n", elem.OutputXML(isRoot))
+		}
 	}
 	return nil
 }

diff --git a/xq_test.go b/xq_test.go
@@ -153,6 +153,7 @@ func Test_query(t *testing.T) {
 		{"test root element specifically queried by name", args{newStringReader("<abc></abc>"), "/abc"}, "<abc></abc>", nil},
 		{"test root element specifically queried", args{newStringReader("<abc></abc>"), "/"}, "<?xml?><abc></abc>", nil},
 		{"test root element queried", args{newStringReader("<abc></abc>"), "/*"}, "<abc></abc>", nil},
+		{"test attribute node", args{newStringReader("<abc id=\"test\"></abc>"), "/abc/@id"}, "test", nil},
 	}
 
 	for _, tt := range tests {