Mercurial > gemma

comparison pkg/imports/sr.go @ 4177:8b75ac5e243e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Made 'staticcheck' happy with pgxutils package.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 05 Aug 2019 17:16:46 +0200
parents 5a650cde0574
children 49012340336c
comparison
equal deleted inserted replaced
4176:c9315a6eb2c2 4177:8b75ac5e243e
235 235
236 feedback.Info("Looking for 'meta.json'") 236 feedback.Info("Looking for 'meta.json'")
237 237
238 mf := common.FindInZIP(z, "meta.json") 238 mf := common.FindInZIP(z, "meta.json")
239 if mf == nil && !sr.completeOverride() { 239 if mf == nil && !sr.completeOverride() {
240 return nil, errors.New("Cannot find 'meta.json'") 240 return nil, errors.New("cannot find 'meta.json'")
241 } 241 }
242 242
243 m, err := sr.loadMeta(mf) 243 m, err := sr.loadMeta(mf)
244 if err != nil { 244 if err != nil {
245 return nil, err 245 return nil, err
268 &ldc, 268 &ldc,
269 &depthReference, 269 &depthReference,
270 ) 270 )
271 switch { 271 switch {
272 case err == sql.ErrNoRows: 272 case err == sql.ErrNoRows:
273 return nil, errors.New("Cannot load LDC value") 273 return nil, errors.New("cannot load LDC value")
274 case err != nil: 274 case err != nil:
275 return nil, err 275 return nil, err
276 } 276 }
277 277
278 // LDC is cm. The data is in m. 278 // LDC is cm. The data is in m.
298 if xyzf = common.FindInZIP(z, ext); xyzf != nil { 298 if xyzf = common.FindInZIP(z, ext); xyzf != nil {
299 break 299 break
300 } 300 }
301 } 301 }
302 if xyzf == nil { 302 if xyzf == nil {
303 return nil, errors.New("Cannot find any *.xyz or *.txt file") 303 return nil, errors.New("cannot find any *.xyz or *.txt file")
304 } 304 }
305 xyz, err = loadXYZ(xyzf, feedback, xform) 305 xyz, err = loadXYZ(xyzf, feedback, xform)
306 } else { // TXT file mode 306 } else { // TXT file mode
307 xyz, err = loadXYZFile(zpath, feedback, xform) 307 xyz, err = loadXYZFile(zpath, feedback, xform)
308 } 308 }
606 ) 606 )
607 607
608 switch { 608 switch {
609 case err == sql.ErrNoRows: 609 case err == sql.ErrNoRows:
610 return nil, fmt.Errorf( 610 return nil, fmt.Errorf(
611 "No matching bottleneck of given name or time available: %v", err) 611 "no matching bottleneck of given name or time available: %v", err)
612 case err != nil: 612 case err != nil:
613 return nil, err 613 return nil, err
614 } 614 }
615 615
616 h := sha1.New() 616 h := sha1.New()
799 return nil, nil 799 return nil, nil
800 } 800 }
801 prefix := strings.TrimSuffix(shpF.Name, path.Ext(shpF.Name)) 801 prefix := strings.TrimSuffix(shpF.Name, path.Ext(shpF.Name))
802 dbfF := common.FindInZIP(z, prefix+".dbf") 802 dbfF := common.FindInZIP(z, prefix+".dbf")
803 if dbfF == nil { 803 if dbfF == nil {
804 return nil, fmt.Errorf("No DBF file found for %s", shpF.Name) 804 return nil, fmt.Errorf("no DBF file found for %s", shpF.Name)
805 } 805 }
806 806
807 shpR, err := shpF.Open() 807 shpR, err := shpF.Open()
808 if err != nil { 808 if err != nil {
809 return nil, err 809 return nil, err