Mercurial > gemma

comparison pkg/controllers/surveys.go @ 4244:4394daeea96a json-handler-middleware

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved JSONHandler into middleware package.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 22 Aug 2019 11:26:48 +0200
parents d776110b4db0
children fc082c611b8b
comparison
equal deleted inserted replaced
4243:d776110b4db0 4244:4394daeea96a
17 17
18 import ( 18 import (
19 "database/sql" 19 "database/sql"
20 "net/http" 20 "net/http"
21 21
22 "github.com/gorilla/mux"
23
22 "gemma.intevation.de/gemma/pkg/models" 24 "gemma.intevation.de/gemma/pkg/models"
23 "github.com/gorilla/mux" 25
26 mw "gemma.intevation.de/gemma/pkg/middleware"
24 ) 27 )
25 28
26 const ( 29 const (
27 listSurveysSQL = ` 30 listSurveysSQL = `
28 SELECT 31 SELECT
39 ON s.depth_reference = r.depth_reference 42 ON s.depth_reference = r.depth_reference
40 AND g.location = r.location AND g.validity = r.validity 43 AND g.location = r.location AND g.validity = r.validity
41 WHERE b.objnam = $1 AND s.date_info::timestamptz <@ b.validity` 44 WHERE b.objnam = $1 AND s.date_info::timestamptz <@ b.validity`
42 ) 45 )
43 46
44 func listSurveys(req *http.Request) (jr JSONResult, err error) { 47 func listSurveys(req *http.Request) (jr mw.JSONResult, err error) {
45 48
46 bottleneckName := mux.Vars(req)["bottleneck"] 49 bottleneckName := mux.Vars(req)["bottleneck"]
47 50
48 var rows *sql.Rows 51 var rows *sql.Rows
49 52
50 rows, err = JSONConn(req).QueryContext(req.Context(), listSurveysSQL, bottleneckName) 53 rows, err = mw.JSONConn(req).QueryContext(req.Context(), listSurveysSQL, bottleneckName)
51 if err != nil { 54 if err != nil {
52 return 55 return
53 } 56 }
54 defer rows.Close() 57 defer rows.Close()
55 58
78 81
79 if err = rows.Err(); err != nil { 82 if err = rows.Err(); err != nil {
80 return 83 return
81 } 84 }
82 85
83 jr = JSONResult{ 86 jr = mw.JSONResult{
84 Result: struct { 87 Result: struct {
85 Surveys []*models.Survey `json:"surveys"` 88 Surveys []*models.Survey `json:"surveys"`
86 }{surveys}, 89 }{surveys},
87 } 90 }
88 return 91 return