# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1544181715 -3600
# Node ID 5874cedd7f9114005e9225cb853b944975a7dc69
# Parent  3cc3b739080539a27644a6d9c1bc363a1edb1f81
Sounding result import: Accept *.txt files for XYZ data, too.

diff -r 3cc3b7390805 -r 5874cedd7f91 pkg/controllers/srimports.go
--- a/pkg/controllers/srimports.go	Fri Dec 07 11:21:16 2018 +0100
+++ b/pkg/controllers/srimports.go	Fri Dec 07 12:21:55 2018 +0100
@@ -217,12 +217,14 @@
 		Messages []string    `json:"messages,omitempty"`
 	}
 
-	var noXYZ bool
-	if noXYZ = common.FindInZIP(zr, ".xyz") == nil; noXYZ {
-		messages = append(messages, "no .xyz file found.")
+	find := func(ext string) *zip.File { return common.FindInZIP(zr, ext) }
+
+	noXYZ := find(".xyz") == nil && find(".txt") == nil
+	if noXYZ {
+		messages = append(messages, "no .xyz or .txt file found.")
 	}
 
-	if mj := common.FindInZIP(zr, "meta.json"); mj == nil {
+	if mj := find("meta.json"); mj == nil {
 		messages = append(messages, "no 'meta.json' file found.")
 	} else {
 		if meta, err := loadMeta(mj); err != nil {
diff -r 3cc3b7390805 -r 5874cedd7f91 pkg/imports/sr.go
--- 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)