Mercurial > gemma

comparison pkg/controllers/fwa.go @ 5201:40daecc6f552 new-fwa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Made timeranges all UTC.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Fri, 08 May 2020 15:34:28 +0200
parents 5572da077c89
children fbc79c8459b4
comparison
equal deleted inserted replaced
5200:5572da077c89 5201:40daecc6f552
185 185
186 func (tr *timeRange) intersects(from, to time.Time) bool { 186 func (tr *timeRange) intersects(from, to time.Time) bool {
187 return !(to.Before(tr.lower) || from.After(tr.upper)) 187 return !(to.Before(tr.lower) || from.After(tr.upper))
188 } 188 }
189 189
190 func (tr *timeRange) toUTC() {
191 tr.lower = tr.lower.UTC()
192 tr.upper = tr.upper.UTC()
193 }
194
190 func (lvs limitingValidities) find() func(from, to time.Time) *limitingValidity { 195 func (lvs limitingValidities) find() func(from, to time.Time) *limitingValidity {
191 196
192 var last *limitingValidity 197 var last *limitingValidity
193 198
194 return func(from, to time.Time) *limitingValidity { 199 return func(from, to time.Time) *limitingValidity {
231 &lv.lower, 236 &lv.lower,
232 &lv.upper, 237 &lv.upper,
233 ); err != nil { 238 ); err != nil {
234 return nil, err 239 return nil, err
235 } 240 }
236 lv.lower = lv.lower.UTC() 241 lv.toUTC()
237 lv.upper = lv.upper.UTC()
238 lvs = append(lvs, lv) 242 lvs = append(lvs, lv)
239 } 243 }
240 244
241 return lvs, rows.Err() 245 return lvs, rows.Err()
242 } 246 }
338 for rows.Next() { 342 for rows.Next() {
339 var l ldc 343 var l ldc
340 if err := rows.Scan(&l.lower, &l.upper, &l.value); err != nil { 344 if err := rows.Scan(&l.lower, &l.upper, &l.value); err != nil {
341 return err 345 return err
342 } 346 }
347 l.toUTC()
343 for i := range bn.validities { 348 for i := range bn.validities {
344 vs := bn.validities[i] 349 vs := bn.validities[i]
345 if vs.intersects(l.lower, l.upper) { 350 if vs.intersects(l.lower, l.upper) {
346 vs.ldcs = append(vs.ldcs, &l) 351 vs.ldcs = append(vs.ldcs, &l)
347 } 352 }