suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2025-01-12 19:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

wipt

Browse Source
This commit is contained in:
Mike Farah 2021-12-16 22:20:37 +11:00
parent 4571ec825f
commit dbe3921f5d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/yqlib/decoder_xml.go
View File

@ -17,7 +17,10 @@ type xmlDecoder struct {
} }
func NewXmlDecoder(reader io.Reader, attributePrefix string, contentPrefix string) Decoder { func NewXmlDecoder(reader io.Reader, attributePrefix string, contentPrefix string) Decoder {
return &xmlDecoder{reader: reader, attributePrefix: attributePrefix, contentPrefix: "c", finished: false} if contentPrefix == "" {
contentPrefix = "content"
}
return &xmlDecoder{reader: reader, attributePrefix: attributePrefix, contentPrefix: contentPrefix, finished: false}
} }
func (dec *xmlDecoder) createSequence(nodes []*xmlNode) (*yaml.Node, error) { func (dec *xmlDecoder) createSequence(nodes []*xmlNode) (*yaml.Node, error) {

2
pkg/yqlib/stream_evaluator.go
View File

@ -93,7 +93,7 @@ func (s *streamEvaluator) EvaluateFiles(expression string, filenames []string, p
func (s *streamEvaluator) Evaluate(filename string, reader io.Reader, node *ExpressionNode, printer Printer, leadingContent string) (uint, error) { func (s *streamEvaluator) Evaluate(filename string, reader io.Reader, node *ExpressionNode, printer Printer, leadingContent string) (uint, error) {
var currentIndex uint var currentIndex uint
decoder := NewXmlDecoder(reader, "+", "c") decoder := NewXmlDecoder(reader, "+", "")
for { for {
var dataBucket yaml.Node var dataBucket yaml.Node
errorReading := decoder.Decode(&dataBucket) errorReading := decoder.Decode(&dataBucket)