gvsafronov/tile38
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed nearby json field results showing wrong data

Browse Source 
issue #453
This commit is contained in:
Melissa Baker 2019-05-21 12:15:56 -07:00
parent e8801fd45a
commit 46f5d2d224
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/server/scanner.go
View File

@ -355,13 +355,10 @@ func (sw *scanWriter) writeObject(opts ScanWriterParams) bool {
sw.mu.Lock() sw.mu.Lock()
defer sw.mu.Unlock() defer sw.mu.Unlock()
} }
var fieldVals []float64
var ok bool var ok bool
keepGoing := true keepGoing := true
if opts.skipTesting { if !opts.skipTesting {
fieldVals = sw.fvals ok, keepGoing, _ = sw.testObject(opts.id, opts.o, opts.fields, opts.ignoreGlobMatch)
} else {
ok, keepGoing, fieldVals = sw.testObject(opts.id, opts.o, opts.fields, opts.ignoreGlobMatch)
if !ok { if !ok {
return keepGoing return keepGoing
} }
@ -403,11 +400,15 @@ func (sw *scanWriter) writeObject(opts ScanWriterParams) bool {
} else if len(sw.farr) > 0 { } else if len(sw.farr) > 0 {
jsfields = `,"fields":[` jsfields = `,"fields":[`
for i, field := range fieldVals { for i := range sw.farr {
if i > 0 { if i > 0 {
jsfields += "," jsfields += `,`
}
if len(opts.fields) > i {
jsfields += strconv.FormatFloat(opts.fields[i], 'f', -1, 64)
} else {
jsfields += "0"
} }
jsfields += strconv.FormatFloat(field, 'f', -1, 64)
} }
jsfields += `]` jsfields += `]`
} }