Skip to content

Commit

Permalink
Fix not displaying only included columns
Browse files Browse the repository at this point in the history
  • Loading branch information
aswinkarthik committed Feb 28, 2019
1 parent 1b4a540 commit d78e953
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions cmd/formatter.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"encoding/json"
"fmt"
"io"
"strings"

"github.com/aswinkarthik/csvdiff/pkg/digest"
)
Expand Down Expand Up @@ -50,14 +49,16 @@ func (f *Formatter) json(diff digest.Differences) error {
Modifications []string
}

includes := config.GetIncludeColumnPositions()

additions := make([]string, 0, len(diff.Additions))
for _, addition := range diff.Additions {
additions = append(additions, strings.Join(addition, ","))
additions = append(additions, includes.MapToValue(addition))
}

modifications := make([]string, 0, len(diff.Modifications))
for _, modification := range diff.Modifications {
modifications = append(modifications, strings.Join(modification.Current, ","))
modifications = append(modifications, includes.MapToValue(modification.Current))
}

jsonDiff := jsonDifference{Additions: additions, Modifications: modifications}
Expand All @@ -84,14 +85,16 @@ func (f *Formatter) rowMark(diff digest.Differences) error {
fmt.Fprintf(f.stderr, "Modifications %d\n", len(diff.Modifications))
fmt.Fprintf(f.stderr, "Rows:\n")

includes := config.GetIncludeColumnPositions()

additions := make([]string, 0, len(diff.Additions))
for _, addition := range diff.Additions {
additions = append(additions, strings.Join(addition, ","))
additions = append(additions, includes.MapToValue(addition))
}

modifications := make([]string, 0, len(diff.Modifications))
for _, modification := range diff.Modifications {
modifications = append(modifications, strings.Join(modification.Current, ","))
modifications = append(modifications, includes.MapToValue(modification.Current))
}

for _, added := range additions {
Expand Down

0 comments on commit d78e953

Please sign in to comment.