Mercurial > gemma

comparison pkg/controllers/srimports.go @ 4242:1458c9b0fdaa json-handler-middleware

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Made the sql.Conn in function accessible via the context of the request.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 22 Aug 2019 10:18:13 +0200
parents 34623265eac1
children d776110b4db0
comparison
equal deleted inserted replaced
4240:a4f76e170290 4242:1458c9b0fdaa
13 13
14 package controllers 14 package controllers
15 15
16 import ( 16 import (
17 "archive/zip" 17 "archive/zip"
18 "database/sql"
19 "encoding/hex" 18 "encoding/hex"
20 "fmt" 19 "fmt"
21 "log" 20 "log"
22 "net/http" 21 "net/http"
23 "os" 22 "os"
191 } 190 }
192 191
193 func uploadSoundingResult( 192 func uploadSoundingResult(
194 _ interface{}, 193 _ interface{},
195 req *http.Request, 194 req *http.Request,
196 conn *sql.Conn,
197 ) (jr JSONResult, err error) { 195 ) (jr JSONResult, err error) {
198 196
199 var dir string 197 var dir string
200 if dir, err = misc.StoreUploadedFile( 198 if dir, err = misc.StoreUploadedFile(
201 req, 199 req,
246 } else { 244 } else {
247 if meta, err := loadMeta(mj); err != nil { 245 if meta, err := loadMeta(mj); err != nil {
248 messages = append(messages, 246 messages = append(messages,
249 fmt.Sprintf("'meta.json' found but invalid: %v", err)) 247 fmt.Sprintf("'meta.json' found but invalid: %v", err))
250 } else { 248 } else {
251 errs := meta.Validate(req.Context(), conn) 249 errs := meta.Validate(req.Context(), JSONConn(req))
252 for _, err := range errs { 250 for _, err := range errs {
253 messages = append(messages, 251 messages = append(messages,
254 fmt.Sprintf("invalid 'meta.json': %v", err)) 252 fmt.Sprintf("invalid 'meta.json': %v", err))
255 } 253 }
256 result.Meta = meta 254 result.Meta = meta