# HG changeset patch # User Sascha L. Teichmann # Date 1563958458 -7200 # Node ID f2d5bf42ed38b9454d4a64d18e0f1b8fbf813598 # Parent 4f2f34f5d14d35e239bee8c2d8b5c9cf764824a7 AGM import: Simplified min/max measuredate handling a little bit. diff -r 4f2f34f5d14d -r f2d5bf42ed38 pkg/imports/agm.go --- a/pkg/imports/agm.go Tue Jul 23 16:59:43 2019 +0200 +++ b/pkg/imports/agm.go Wed Jul 24 10:54:18 2019 +0200 @@ -326,7 +326,7 @@ agmLines := []*agmLine{} ignored := 0 - mdMinMax := map[models.Isrs][2]time.Time{} + mdMinMax := map[models.Isrs]*[2]time.Time{} lines: for line := 1; ; line++ { @@ -381,15 +381,15 @@ if err != nil { return nil, fmt.Errorf("Invalid 'measure_date' line %d: %v", line, err) } - if _, hasGid := mdMinMax[*gid]; hasGid { - if md.Before(mdMinMax[*gid][0]) { - mdMinMax[*gid] = [2]time.Time{md, mdMinMax[*gid][1]} + if v := mdMinMax[*gid]; v != nil { + if md.Before(v[0]) { + v[0] = md } - if md.After(mdMinMax[*gid][1]) { - mdMinMax[*gid] = [2]time.Time{mdMinMax[*gid][0], md} + if md.After(v[1]) { + v[1] = md } } else { - mdMinMax[*gid] = [2]time.Time{md, md} + mdMinMax[*gid] = &[2]time.Time{md, md} } newSender := agm.Originator