gemma: pkg/controllers/srimports.go annotate

annotate pkg/controllers/srimports.go @ 3678:8f58851927c0

client: make layer factory only return new layer config for individual maps instead of each time it is invoked. The purpose of the factory was to support multiple maps with individual layers. But returning a new config each time it is invoked leads to bugs that rely on the layer's state. Now this factory reuses the same objects it created before, per map.

author	Markus Kottlaender <markus@intevation.de>
date	Mon, 17 Jun 2019 17:31:35 +0200
parents	479da494bc09
children	3d2b8f542d89

rev	line source
1017 a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1010 diff changeset	1 // This is Free Software under GNU Affero General Public License v >= 3.0
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1010 diff changeset	2 // without warranty, see README.md and license for details.
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1010 diff changeset	3 //
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1010 diff changeset	4 // SPDX-License-Identifier: AGPL-3.0-or-later
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1010 diff changeset	5 // License-Filename: LICENSES/AGPL-3.0.txt
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1010 diff changeset	6 //
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1010 diff changeset	7 // Copyright (C) 2018 by via donau
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1010 diff changeset	8 // – Österreichische Wasserstraßen-Gesellschaft mbH
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1010 diff changeset	9 // Software engineering by Intevation GmbH
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1010 diff changeset	10 //
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1010 diff changeset	11 // Author(s):
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1010 diff changeset	12 // * Sascha L. Teichmann <sascha.teichmann@intevation.de>
a244b18cb916 Added GNU Affero General Public License. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1010 diff changeset	13
978 544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	14 package controllers
544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	15
544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	16 import (
1225 4d7c44f7044e Factored out som zip lookup code to be reusable in sounding result upload controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1224 diff changeset	17 "archive/zip"
1224 bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	18 "database/sql"
1221 c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	19 "encoding/hex"
1226 2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	20 "fmt"
978 544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	21 "log"
544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	22 "net/http"
544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	23 "os"
544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	24 "path/filepath"
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	25 "strconv"
3585 479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2995 diff changeset	26 "strings"
1226 2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	27 "sync"
1221 c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	28 "time"
978 544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	29
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	30 "github.com/gorilla/mux"
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	31
979 7934b5c1a910 Finally enqueue sounding result import job to import jobs. Sascha L. Teichmann <teichmann@intevation.de> parents: 978 diff changeset	32 "gemma.intevation.de/gemma/pkg/auth"
1226 2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	33 "gemma.intevation.de/gemma/pkg/common"
978 544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	34 "gemma.intevation.de/gemma/pkg/config"
979 7934b5c1a910 Finally enqueue sounding result import job to import jobs. Sascha L. Teichmann <teichmann@intevation.de> parents: 978 diff changeset	35 "gemma.intevation.de/gemma/pkg/imports"
1221 c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	36 "gemma.intevation.de/gemma/pkg/misc"
1226 2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	37 "gemma.intevation.de/gemma/pkg/models"
978 544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	38 )
544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	39
544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	40 const (
2194 4d6979dedb11 Imports: Deduplicted file upload code. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2075 diff changeset	41 soundingResultName = "soundingresult"
978 544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	42 maxSoundingResultSize = 25 * 1024 * 1024
544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	43 )
544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	44
1224 bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	45 func fetchSoundingResult(req *http.Request) (string, error) {
978 544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	46
1221 c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	47 // Check first if we have a token.
c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	48 if token := req.FormValue("token"); token != "" {
c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	49 if _, err := hex.DecodeString(token); err != nil {
c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	50 return "", err
c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	51 }
c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	52 dir := config.TmpDir()
c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	53 if dir == "" {
c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	54 dir = os.TempDir()
c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	55 }
c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	56 // XXX: This should hopefully be race-free enough.
c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	57 now := time.Now().Format("2006-15-04-05")
c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	58 dst := filepath.Join(dir, soundingResultName+"-"+token+"-"+now)
c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	59 if err := misc.UnmakeTempFile(token, dst); err != nil {
c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	60 return "", err
c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	61 }
1241 a45fa8943254 Sounding result import: Forgot to return the token temp file to the importer. Doh! Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1239 diff changeset	62 return dst, nil
1221 c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	63 }
c193649d4f11 Add an area for temp uploads on the server to be addressed Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1203 diff changeset	64
2194 4d6979dedb11 Imports: Deduplicted file upload code. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2075 diff changeset	65 return misc.StoreUploadedFile(
4d6979dedb11 Imports: Deduplicted file upload code. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2075 diff changeset	66 req,
4d6979dedb11 Imports: Deduplicted file upload code. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2075 diff changeset	67 soundingResultName,
4d6979dedb11 Imports: Deduplicted file upload code. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2075 diff changeset	68 "sr.zip",
4d6979dedb11 Imports: Deduplicted file upload code. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2075 diff changeset	69 maxSoundingResultSize,
4d6979dedb11 Imports: Deduplicted file upload code. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2075 diff changeset	70 )
978 544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	71 }
544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	72
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	73 func fetchSoundingResultMetaOverrides(sr imports.SoundingResult, req http.Request) error {
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	74
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	75 if v := req.FormValue("epsg"); v != "" {
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	76 epsg, err := strconv.ParseUint(v, 10, 32)
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	77 if err != nil {
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	78 return err
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	79 }
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	80 srid := uint(epsg)
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	81 sr.EPSG = &srid
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	82 }
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	83
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	84 if v := req.FormValue("date"); v != "" {
2059 ae0021feaac8 Imports: Made stretch import marshable (even if it is not needed). Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1985 diff changeset	85 date, err := time.Parse(common.DateFormat, v)
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	86 if err != nil {
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	87 return err
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	88 }
1900 6a67cd819e93 To prepare stretch import made some model data types re-usable. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1787 diff changeset	89 sr.Date = &models.Date{Time: date}
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	90 }
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	91
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	92 if v := req.FormValue("depth-reference"); v != "" {
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	93 sr.DepthReference = &v
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	94 }
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	95
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	96 if v := req.FormValue("bottleneck"); v != "" {
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	97 sr.Bottleneck = &v
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	98 }
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	99
3585 479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2995 diff changeset	100 if v := req.FormValue("beam-type"); v != "" {
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2995 diff changeset	101 var singleBeam bool
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2995 diff changeset	102 switch strings.ToLower(v) {
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2995 diff changeset	103 case "multibeam":
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2995 diff changeset	104 singleBeam = false
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2995 diff changeset	105 case "singlebeam":
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2995 diff changeset	106 singleBeam = true
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2995 diff changeset	107 default:
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2995 diff changeset	108 return fmt.Errorf("Unknown beam-type '%s'", v)
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2995 diff changeset	109 }
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2995 diff changeset	110 sr.SingleBeam = &singleBeam
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2995 diff changeset	111 }
479da494bc09 SR import: access beam-type parameter supplied by client. TODO: Implement single beam code path. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2995 diff changeset	112
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	113 return nil
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	114 }
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	115
978 544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	116 func importSoundingResult(rw http.ResponseWriter, req *http.Request) {
544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	117
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	118 sr := new(imports.SoundingResult)
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	119
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	120 if err := fetchSoundingResultMetaOverrides(sr, req); err != nil {
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	121 log.Printf("error: %v\n", err)
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	122 http.Error(rw, "error: "+err.Error(), http.StatusBadRequest)
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	123 return
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	124 }
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	125
1224 bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	126 dir, err := fetchSoundingResult(req)
978 544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	127 if err != nil {
544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	128 log.Printf("error: %v\n", err)
544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	129 http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError)
544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	130 return
544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	131 }
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	132 sr.Dir = dir
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	133
1531 24445a618513 Added stub for bottleneck importer. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1528 diff changeset	134 serialized, err := common.ToJSONString(sr)
1239 d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	135 if err != nil {
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	136 log.Printf("error: %v\n", err)
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	137 http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError)
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	138 return
d842d9d10872 Sounding result import: Added the feature to override bottleneck, EPSG, depth reference and date in meta.json by POST arguments. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1228 diff changeset	139 }
978 544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	140
979 7934b5c1a910 Finally enqueue sounding result import job to import jobs. Sascha L. Teichmann <teichmann@intevation.de> parents: 978 diff changeset	141 session, _ := auth.GetSession(req)
7934b5c1a910 Finally enqueue sounding result import job to import jobs. Sascha L. Teichmann <teichmann@intevation.de> parents: 978 diff changeset	142
2995 5222bfe5b4af Upload imports: spell form field 'send-email' instead of 'email'. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2194 diff changeset	143 sendEmail := req.FormValue("send-email") != ""
1646 a0982c38eac0 Import queue: Implemented email notifications. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1642 diff changeset	144
1642 49c04bb64e0a Import queue: Implemented auto-accept and email sending. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1531 diff changeset	145 jobID, err := imports.AddJob(
49c04bb64e0a Import queue: Implemented auto-accept and email sending. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1531 diff changeset	146 imports.SRJobKind,
2075 e7f3199384ec Sounding results import: Removed senseless parameters. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2059 diff changeset	147 time.Time{}, // due
e7f3199384ec Sounding results import: Removed senseless parameters. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2059 diff changeset	148 nil, // trys
e7f3199384ec Sounding results import: Removed senseless parameters. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2059 diff changeset	149 nil, // retry wait
1642 49c04bb64e0a Import queue: Implemented auto-accept and email sending. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1531 diff changeset	150 session.User,
1754 807569b08513 Import queue: Auto acceptance is now a property of the import kind itself and is not configurable any more. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1708 diff changeset	151 sendEmail,
1642 49c04bb64e0a Import queue: Implemented auto-accept and email sending. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1531 diff changeset	152 serialized)
49c04bb64e0a Import queue: Implemented auto-accept and email sending. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1531 diff changeset	153
998 75e65599ea52 Persist job queue in database. WIP. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	154 if err != nil {
75e65599ea52 Persist job queue in database. WIP. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	155 log.Printf("error: %v\n", err)
75e65599ea52 Persist job queue in database. WIP. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	156 http.Error(rw, "error: "+err.Error(), http.StatusInternalServerError)
75e65599ea52 Persist job queue in database. WIP. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	157 return
75e65599ea52 Persist job queue in database. WIP. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	158 }
75e65599ea52 Persist job queue in database. WIP. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 991 diff changeset	159
1010 8f23ec811afb Fixed and harmonized wording in importer queue a bit. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 998 diff changeset	160 log.Printf("info: added import #%d to queue\n", jobID)
979 7934b5c1a910 Finally enqueue sounding result import job to import jobs. Sascha L. Teichmann <teichmann@intevation.de> parents: 978 diff changeset	161
7934b5c1a910 Finally enqueue sounding result import job to import jobs. Sascha L. Teichmann <teichmann@intevation.de> parents: 978 diff changeset	162 result := struct {
7934b5c1a910 Finally enqueue sounding result import job to import jobs. Sascha L. Teichmann <teichmann@intevation.de> parents: 978 diff changeset	163 ID int64 `json:"id"`
7934b5c1a910 Finally enqueue sounding result import job to import jobs. Sascha L. Teichmann <teichmann@intevation.de> parents: 978 diff changeset	164 }{
7934b5c1a910 Finally enqueue sounding result import job to import jobs. Sascha L. Teichmann <teichmann@intevation.de> parents: 978 diff changeset	165 ID: jobID,
7934b5c1a910 Finally enqueue sounding result import job to import jobs. Sascha L. Teichmann <teichmann@intevation.de> parents: 978 diff changeset	166 }
7934b5c1a910 Finally enqueue sounding result import job to import jobs. Sascha L. Teichmann <teichmann@intevation.de> parents: 978 diff changeset	167 SendJSON(rw, http.StatusCreated, &result)
978 544a5cfe07cd Started with endpoint for uploading sounding result and trigger respective import job. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: diff changeset	168 }
1224 bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	169
1226 2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	170 func loadMeta(f zip.File) (models.SoundingResultMeta, error) {
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	171 r, err := f.Open()
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	172 if err != nil {
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	173 return nil, err
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	174 }
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	175 defer r.Close()
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	176 var m models.SoundingResultMeta
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	177 return &m, m.Decode(r)
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	178 }
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	179
1224 bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	180 func uploadSoundingResult(
bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	181 _ interface{},
bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	182 req *http.Request,
bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	183 conn *sql.Conn,
bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	184 ) (jr JSONResult, err error) {
bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	185
bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	186 var dir string
2194 4d6979dedb11 Imports: Deduplicted file upload code. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2075 diff changeset	187 if dir, err = misc.StoreUploadedFile(
4d6979dedb11 Imports: Deduplicted file upload code. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2075 diff changeset	188 req,
4d6979dedb11 Imports: Deduplicted file upload code. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2075 diff changeset	189 soundingResultName,
4d6979dedb11 Imports: Deduplicted file upload code. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2075 diff changeset	190 "sr.zip",
4d6979dedb11 Imports: Deduplicted file upload code. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2075 diff changeset	191 maxSoundingResultSize,
4d6979dedb11 Imports: Deduplicted file upload code. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 2075 diff changeset	192 ); err != nil {
1224 bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	193 return
bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	194 }
bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	195
1225 4d7c44f7044e Factored out som zip lookup code to be reusable in sounding result upload controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1224 diff changeset	196 srFile := filepath.Join(dir, "sr.zip")
4d7c44f7044e Factored out som zip lookup code to be reusable in sounding result upload controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1224 diff changeset	197
4d7c44f7044e Factored out som zip lookup code to be reusable in sounding result upload controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1224 diff changeset	198 var zr *zip.ReadCloser
4d7c44f7044e Factored out som zip lookup code to be reusable in sounding result upload controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1224 diff changeset	199 if zr, err = zip.OpenReader(srFile); err != nil {
4d7c44f7044e Factored out som zip lookup code to be reusable in sounding result upload controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1224 diff changeset	200 return
4d7c44f7044e Factored out som zip lookup code to be reusable in sounding result upload controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1224 diff changeset	201 }
1226 2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	202 var once sync.Once
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	203 closeOnce := func() { zr.Close() }
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	204 defer once.Do(closeOnce)
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	205
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	206 var messages []string
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	207
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	208 var result struct {
1227 737e1acea1f1 If there are no XYZ files in the ZIP we cant help the user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1226 diff changeset	209 Token string `json:"token,omitempty"`
1226 2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	210 Meta interface{} `json:"meta,omitempty"`
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	211 Messages []string `json:"messages,omitempty"`
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	212 }
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	213
1528 5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1328 diff changeset	214 find := func(ext string) *zip.File { return common.FindInZIP(zr, ext) }
5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1328 diff changeset	215
5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1328 diff changeset	216 noXYZ := find(".xyz") == nil && find(".txt") == nil
5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1328 diff changeset	217 if noXYZ {
5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1328 diff changeset	218 messages = append(messages, "no .xyz or .txt file found.")
1226 2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	219 }
1225 4d7c44f7044e Factored out som zip lookup code to be reusable in sounding result upload controller. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1224 diff changeset	220
1528 5874cedd7f91 Sounding result import: Accept .txt files for XYZ data, too. Sascha L. Teichmann <sascha.teichmann@intevation.de>* parents: 1328 diff changeset	221 if mj := find("meta.json"); mj == nil {
1226 2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	222 messages = append(messages, "no 'meta.json' file found.")
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	223 } else {
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	224 if meta, err := loadMeta(mj); err != nil {
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	225 messages = append(messages,
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	226 fmt.Sprintf("'meta.json' found but invalid: %v", err))
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	227 } else {
1328 d753ce6cf588 To make golint happier made context.Context to be the first argument in all calls. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1321 diff changeset	228 errs := meta.Validate(req.Context(), conn)
1226 2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	229 for _, err := range errs {
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	230 messages = append(messages,
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	231 fmt.Sprintf("invalid 'meta.json': %v", err))
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	232 }
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	233 result.Meta = meta
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	234 }
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	235 }
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	236 once.Do(closeOnce)
1224 bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	237
1227 737e1acea1f1 If there are no XYZ files in the ZIP we cant help the user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1226 diff changeset	238 code := http.StatusCreated
737e1acea1f1 If there are no XYZ files in the ZIP we cant help the user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1226 diff changeset	239
737e1acea1f1 If there are no XYZ files in the ZIP we cant help the user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1226 diff changeset	240 // If there are no XYZ data we cant help the user anyway.
737e1acea1f1 If there are no XYZ files in the ZIP we cant help the user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1226 diff changeset	241 if noXYZ {
1228 17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	242 code = http.StatusBadRequest
1227 737e1acea1f1 If there are no XYZ files in the ZIP we cant help the user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1226 diff changeset	243 if err2 := os.RemoveAll(dir); err2 != nil {
737e1acea1f1 If there are no XYZ files in the ZIP we cant help the user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1226 diff changeset	244 log.Printf("error: %v\n", err2)
737e1acea1f1 If there are no XYZ files in the ZIP we cant help the user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1226 diff changeset	245 }
737e1acea1f1 If there are no XYZ files in the ZIP we cant help the user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1226 diff changeset	246 } else if result.Token, err = misc.MakeTempFile(dir); err != nil {
1226 2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	247 if err2 := os.RemoveAll(dir); err2 != nil {
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	248 log.Printf("error: %v\n", err2)
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	249 }
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	250 return
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	251 }
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	252
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	253 result.Messages = messages
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	254
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	255 jr = JSONResult{
1227 737e1acea1f1 If there are no XYZ files in the ZIP we cant help the user. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1226 diff changeset	256 Code: code,
1226 2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	257 Result: &result,
2e65e8ddacab Finished the sounding result upload controller to temp uploads. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1225 diff changeset	258 }
1224 bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	259 return
bc4b642c8d04 Started with an upload sounding result to temp upload area. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1221 diff changeset	260 }
1228 17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	261
17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	262 func deleteSoundingUpload(rw http.ResponseWriter, req *http.Request) {
17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	263 token := mux.Vars(req)["token"]
17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	264 if _, err := hex.DecodeString(token); err != nil {
17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	265 http.Error(rw, "Invalid token", http.StatusBadRequest)
17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	266 return
17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	267 }
17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	268 if err := misc.DeleteTempFile(token); err != nil {
17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	269 http.Error(rw, fmt.Sprintf("error: %v", err), http.StatusInternalServerError)
17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	270 return
17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	271 }
17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	272 result := struct {
17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	273 Message string `json:"message"`
17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	274 }{
1297 1c0c9190fcf2 Import sounding result: If uploading a zip with a meta.json which has Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1241 diff changeset	275 Message: fmt.Sprintf("Token %s deleted.", token),
1228 17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	276 }
17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	277 SendJSON(rw, http.StatusOK, &result)
17131f0f9fcb Added endpoint to explicitly delete a temp upload. Sascha L. Teichmann <sascha.teichmann@intevation.de> parents: 1227 diff changeset	278 }

Mercurial > gemma

annotate pkg/controllers/srimports.go @ 3678:8f58851927c0