Mercurial > gemma

changeset 2729:7cb027be277d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
WFS downloader: Really use username and password from parameters.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Tue, 19 Mar 2019 14:34:55 +0100
parents 18dc704e637e
children c642905c0b3b
files pkg/imports/dma.go pkg/imports/fd.go pkg/imports/wa.go pkg/imports/wp.go pkg/imports/wx.go
diffstat 5 files changed, 5 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/imports/dma.go	Tue Mar 19 14:25:37 2019 +0100
+++ b/pkg/imports/dma.go	Tue Mar 19 14:34:55 2019 +0100
@@ -172,10 +172,7 @@
 		features          int
 	)
 
-	// TODO: Fetch from parameters.
-	user, password := "", ""
-
-	if err := dl.Download(user, password, func(url string, r io.Reader) error {
+	if err := dl.Download(dma.User, dma.Password, func(url string, r io.Reader) error {
 		feedback.Info("Get features from: '%s'", url)
 		rfc, err := wfs.ParseRawFeatureCollection(r)
 		if err != nil {
--- a/pkg/imports/fd.go	Tue Mar 19 14:25:37 2019 +0100
+++ b/pkg/imports/fd.go	Tue Mar 19 14:34:55 2019 +0100
@@ -238,10 +238,7 @@
 		fds               []fdSummary
 	)
 
-	// TODO: Fetch from parameters.
-	user, password := "", ""
-
-	if err := dl.Download(user, password, func(url string, r io.Reader) error {
+	if err := dl.Download(fd.User, fd.Password, func(url string, r io.Reader) error {
 		feedback.Info("Get features from: '%s'", url)
 		rfc, err := wfs.ParseRawFeatureCollection(r)
 		if err != nil {
--- a/pkg/imports/wa.go	Tue Mar 19 14:25:37 2019 +0100
+++ b/pkg/imports/wa.go	Tue Mar 19 14:34:55 2019 +0100
@@ -179,10 +179,7 @@
 		features          int
 	)
 
-	// TODO: Fetch from parameters.
-	user, password := "", ""
-
-	if err := dl.Download(user, password, func(url string, r io.Reader) error {
+	if err := dl.Download(wx.User, wx.Password, func(url string, r io.Reader) error {
 		feedback.Info("Get features from: '%s'", url)
 		rfc, err := wfs.ParseRawFeatureCollection(r)
 		if err != nil {
--- a/pkg/imports/wp.go	Tue Mar 19 14:25:37 2019 +0100
+++ b/pkg/imports/wp.go	Tue Mar 19 14:34:55 2019 +0100
@@ -247,10 +247,7 @@
 		features          int
 	)
 
-	// TODO: Fetch from parameters.
-	user, password := "", ""
-
-	if err := dl.Download(user, password, func(url string, r io.Reader) error {
+	if err := dl.Download(wp.User, wp.Password, func(url string, r io.Reader) error {
 		feedback.Info("Get features from: '%s'", url)
 		rfc, err := wfs.ParseRawFeatureCollection(r)
 		if err != nil {
--- a/pkg/imports/wx.go	Tue Mar 19 14:25:37 2019 +0100
+++ b/pkg/imports/wx.go	Tue Mar 19 14:34:55 2019 +0100
@@ -193,10 +193,7 @@
 		features          int
 	)
 
-	// TODO: Fetch from parameters.
-	user, password := "", ""
-
-	if err := dl.Download(user, password, func(url string, r io.Reader) error {
+	if err := dl.Download(wx.User, wx.Password, func(url string, r io.Reader) error {
 		feedback.Info("Get features from: '%s'", url)
 		rfc, err := wfs.ParseRawFeatureCollection(r)
 		if err != nil {