equal
deleted
inserted
replaced
186 data.Year = int(buf[8]) + 2000 |
186 data.Year = int(buf[8]) + 2000 |
187 items = append(items, data) |
187 items = append(items, data) |
188 } |
188 } |
189 |
189 |
190 s.Close() |
190 s.Close() |
191 return items, nil |
191 return mergeItems(items, []measurement{}), nil |
192 } |
192 } |
193 |
193 |
194 func loadFromJSONFile(filename string) (items []measurement, err error) { |
194 func loadFromJSONFile(filename string) (items []measurement, err error) { |
195 data, err := ioutil.ReadFile(filename) |
195 data, err := ioutil.ReadFile(filename) |
196 if err != nil { |
196 if err != nil { |