Mercurial > gemma
diff pkg/controllers/search.go @ 4244:4394daeea96a json-handler-middleware
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 | e020e6e34ad7 |
line wrap: on
line diff
--- a/pkg/controllers/search.go Thu Aug 22 10:54:08 2019 +0200 +++ b/pkg/controllers/search.go Thu Aug 22 11:26:48 2019 +0200 @@ -20,6 +20,8 @@ "strings" "gemma.intevation.de/gemma/pkg/models" + + mw "gemma.intevation.de/gemma/pkg/middleware" ) const ( @@ -38,18 +40,18 @@ ` ) -func searchFeature(req *http.Request) (jr JSONResult, err error) { +func searchFeature(req *http.Request) (jr mw.JSONResult, err error) { - s := JSONInput(req).(*models.SearchRequest) + s := mw.JSONInput(req).(*models.SearchRequest) if len(s.SearchString) == 0 { - err = JSONError{http.StatusBadRequest, + err = mw.JSONError{http.StatusBadRequest, "error: empty search string"} return } var result string - err = JSONConn(req).QueryRowContext( + err = mw.JSONConn(req).QueryRowContext( req.Context(), searchMostSQL, s.SearchString, @@ -63,15 +65,15 @@ return } -func listBottlenecks(req *http.Request) (jr JSONResult, err error) { +func listBottlenecks(req *http.Request) (jr mw.JSONResult, err error) { var result string - err = JSONConn(req).QueryRowContext( + err = mw.JSONConn(req).QueryRowContext( req.Context(), listBottlenecksSQL).Scan(&result) switch { case err == sql.ErrNoRows: - err = JSONError{ + err = mw.JSONError{ Code: http.StatusNotFound, Message: "Cannot find any bottleneck.", } @@ -80,6 +82,6 @@ return } - jr = JSONResult{Result: strings.NewReader(result)} + jr = mw.JSONResult{Result: strings.NewReader(result)} return }