Mercurial > gemma
diff pkg/imports/sr.go @ 1528:5874cedd7f91
Sounding result import: Accept *.txt files for XYZ data, too.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Fri, 07 Dec 2018 12:21:55 +0100 |
| parents | 0abcc82ef976 |
| children | 24445a618513 |
line wrap: on
line diff
--- a/pkg/imports/sr.go Fri Dec 07 11:21:16 2018 +0100 +++ b/pkg/imports/sr.go Fri Dec 07 12:21:55 2018 +0100 @@ -213,10 +213,15 @@ return nil, common.ToError(err) } - feedback.Info("Looking for '*.xyz'") - xyzf := common.FindInZIP(z, ".xyz") + var xyzf *zip.File + for _, ext := range []string{".xyz", ".txt"} { + feedback.Info("Looking for '*%s'", ext) + if xyzf = common.FindInZIP(z, ext); xyzf != nil { + break + } + } if xyzf == nil { - return nil, errors.New("Cannot find any *.xyz file") + return nil, errors.New("Cannot find any *.xyz or *.txt file") } xyz, err := loadXYZ(xyzf, feedback)