Mercurial > gemma
changeset 2667:5ece2c51d1f0 import-overview-rework
More filter simplification.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Thu, 14 Mar 2019 15:51:43 +0100 |
parents | 0d2650dd8f62 |
children | 0fcf80a413a2 |
files | pkg/controllers/importqueue.go |
diffstat | 1 files changed, 6 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/controllers/importqueue.go Thu Mar 14 15:44:40 2019 +0100 +++ b/pkg/controllers/importqueue.go Thu Mar 14 15:51:43 2019 +0100 @@ -135,9 +135,6 @@ var ( stmt strings.Builder args []interface{} - states *pgtype.TextArray - kinds *pgtype.TextArray - ids *pgtype.Int8Array hasCond bool ) @@ -155,31 +152,22 @@ arg(format, v...) } - if st := req.FormValue("states"); st != "" { - states = toTextArray(st, imports.ImportStateNames) - } - - if ks := req.FormValue("kinds"); ks != "" { - kinds = toTextArray(ks, imports.ImportKindNames()) - } - - if idss := req.FormValue("ids"); idss != "" { - ids = toInt8Array(idss) - } - stmt.WriteString(selectImportsSQL) stmt.WriteString(" WHERE ") - if states != nil { + if st := req.FormValue("states"); st != "" { + states := toTextArray(st, imports.ImportStateNames) cond(" state = ANY($%d) ", states) } - if kinds != nil { + if ks := req.FormValue("kinds"); ks != "" { + kinds := toTextArray(ks, imports.ImportKindNames()) cond(" kind = ANY($%d) ", kinds) } - if ids != nil { + if idss := req.FormValue("ids"); idss != "" { + ids := toInt8Array(idss) cond(" id = ANY($%d) ", ids) }