Mercurial > gemma
changeset 4973:adeb4f8c0d6c fairway-marks-import
Honour the fact that structs.Values() can access only exported fields
Promoted fields not being handed over to the prepared statements
lead to lots of errors due to wrong argument counts.
Still an issue: since Dirimp is handled specially, some prepared
statements now get one argument too much.
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Fri, 28 Feb 2020 20:00:05 +0100 |
parents | 0e180d651fc6 |
children | e1d8217954a0 |
files | pkg/imports/fm.go |
diffstat | 1 files changed, 23 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/imports/fm.go Fri Feb 28 19:16:25 2020 +0100 +++ b/pkg/imports/fm.go Fri Feb 28 20:00:05 2020 +0100 @@ -25,7 +25,7 @@ type ( // Properties common to all types of fairway marks - fairwayMarksProperties struct { + FairwayMarksProperties struct { Datsta *string `json:"hydro_datsta"` Datend *string `json:"hydro_datend"` Persta *string `json:"hydro_persta"` @@ -41,8 +41,8 @@ Sorind *string `json:"hydro_sorind"` } - bcnlatProperties struct { - fairwayMarksProperties + BcnlatProperties struct { + FairwayMarksProperties Colour *string `json:"hydro_colour"` Colpat *string `json:"hydro_colpat"` Condtn *int `json:"hydro_condtn"` @@ -50,18 +50,18 @@ } bcnlatHydroProperties struct { - bcnlatProperties + BcnlatProperties Catlam *int64 `json:"hydro_catlam"` } bcnlatIencProperties struct { - bcnlatProperties + BcnlatProperties Catlam *int64 `json:"ienc_catlam"` Dirimp *string `json:"ienc_dirimp"` } - boylatProperties struct { - fairwayMarksProperties + BoylatProperties struct { + FairwayMarksProperties Colour *string `json:"hydro_colour"` Colpat *string `json:"hydro_colpat"` Conrad *int `json:"hydro_conrad"` @@ -69,19 +69,19 @@ } boylatHydroProperties struct { - boylatProperties + BoylatProperties Marsys *int64 `json:"hydro_marsys"` Catlam *int64 `json:"hydro_catlam"` } boylatIencProperties struct { - boylatProperties + BoylatProperties Marsys *int64 `json:"ienc_marsys"` Catlam *int64 `json:"ienc_catlam"` } boycarProperties struct { - fairwayMarksProperties + FairwayMarksProperties Colour *string `json:"hydro_colour"` Colpat *string `json:"hydro_colpat"` Conrad *int `json:"hydro_conrad"` @@ -91,7 +91,7 @@ } boysawProperties struct { - fairwayMarksProperties + FairwayMarksProperties Colour *string `json:"hydro_colour"` Colpat *string `json:"hydro_colpat"` Conrad *int `json:"hydro_conrad"` @@ -100,7 +100,7 @@ } boysppProperties struct { - fairwayMarksProperties + FairwayMarksProperties Colour *string `json:"hydro_colour"` Colpat *string `json:"hydro_colpat"` Conrad *int `json:"hydro_conrad"` @@ -109,22 +109,26 @@ Catspm *string `json:"hydro_catspm"` } - daymarHydroProperties struct { - fairwayMarksProperties + DaymarProperties struct { + FairwayMarksProperties Colour *string `json:"hydro_colour"` Colpat *string `json:"hydro_colpat"` Condtn *int `json:"hydro_condtn"` Topshp *int `json:"hydro_topshp"` } + daymarHydroProperties struct { + DaymarProperties + } + daymarIencProperties struct { - daymarHydroProperties + DaymarProperties Dirimp *string `json:"ienc_dirimp"` Orient *float64 `json:"hydro_orient"` } lightsProperties struct { - fairwayMarksProperties + FairwayMarksProperties Colour *string `json:"hydro_colour"` Condtn *int `json:"hydro_condtn"` Orient *float64 `json:"hydro_orient"` @@ -142,7 +146,7 @@ } notmrkProperties struct { - fairwayMarksProperties + FairwayMarksProperties Condtn *int `json:"hydro_condtn"` Marsys *int `json:"hydro_bcnshp"` Dirimp *string `json:"ienc_dirimp"` @@ -159,7 +163,7 @@ } rtpbcnProperties struct { - fairwayMarksProperties + FairwayMarksProperties Condtn *int `json:"hydro_condtn"` Siggrp *string `json:"hydro_siggrp"` Catrtb *int `json:"hydro_catrtb"` @@ -167,7 +171,7 @@ } topmarProperties struct { - fairwayMarksProperties + FairwayMarksProperties Colour *string `json:"hydro_colour"` Colpat *string `json:"hydro_colpat"` Condtn *int `json:"hydro_condtn"`