Mercurial > gemma
changeset 2765:41f5ac76d642
BT import: allow for rb and lb to be null.
As rb_lb is optional according to drc this is the right thing to do.
| author | Sascha Wilde <wilde@intevation.de> |
|---|---|
| date | Thu, 21 Mar 2019 18:55:52 +0100 |
| parents | f0846d200ce4 |
| children | 1f173d1a731d |
| files | pkg/imports/bn.go schema/gemma.sql |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/imports/bn.go Thu Mar 21 18:21:18 2019 +0100 +++ b/pkg/imports/bn.go Thu Mar 21 18:55:52 2019 +0100 @@ -126,12 +126,12 @@ var rblbRe = regexp.MustCompile(`(..)_(..)`) -func splitRBLB(s string) (string, string) { +func splitRBLB(s string) (*string, *string) { m := rblbRe.FindStringSubmatch(s) if len(m) == 0 { - return "", "" + return nil, nil } - return m[1], m[2] + return &m[1], &m[2] } func revisitingTime(s string) int {
--- a/schema/gemma.sql Thu Mar 21 18:21:18 2019 +0100 +++ b/schema/gemma.sql Thu Mar 21 18:55:52 2019 +0100 @@ -467,8 +467,8 @@ stretch isrsrange NOT NULL, area geography(MULTIPOLYGON, 4326) NOT NULL CHECK(ST_IsValid(CAST(area AS geometry))), - rb char(2) NOT NULL REFERENCES countries, -- from rb_lb in interface - lb char(2) NOT NULL REFERENCES countries, -- from rb_lb in interface + rb char(2) REFERENCES countries, -- from rb_lb in interface + lb char(2) REFERENCES countries, -- from rb_lb in interface responsible_country char(2) NOT NULL REFERENCES countries, revisiting_time smallint NOT NULL, limiting varchar NOT NULL REFERENCES limiting_factors,