Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vlkb-soda
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ViaLactea
vlkb-soda
Commits
959acc40
Commit
959acc40
authored
1 year ago
by
Robert Butora
Browse files
Options
Downloads
Patches
Plain Diff
fixes bug where BANDSYS param was always overwritten with default (WAVE_Barycentric)
parent
4100025a
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
data-access/servlet/src/main/java/webapi/ServletCutout.java
+0
-46
0 additions, 46 deletions
data-access/servlet/src/main/java/webapi/ServletCutout.java
docker/example-compose-ska-soda.yaml
+4
-4
4 additions, 4 deletions
docker/example-compose-ska-soda.yaml
with
4 additions
and
50 deletions
data-access/servlet/src/main/java/webapi/ServletCutout.java
+
0
−
46
View file @
959acc40
...
...
@@ -122,10 +122,6 @@ public class ServletCutout extends javax.servlet.http.HttpServlet
Resolver
rsl
=
new
ResolverFromId
();
rsl
.
resolve
(
id
);
// if(pos != null) pos.setSystem(DEFAULT_SKY_SYSTEM);
if
(
band
!=
null
)
band
.
setSystem
(
DEFAULT_SPEC_SYSTEM
);
if
(
time
!=
null
)
time
.
setSystem
(
DEFAULT_TIME_SYSTEM
);
cutout
.
doStream
(
rsl
.
relPathname
(),
rsl
.
hdunum
(),
pos
,
band
,
time
,
pol
,
respOutputStream
);
}
...
...
@@ -279,18 +275,6 @@ public class ServletCutout extends javax.servlet.http.HttpServlet
writer
.
close
();
}
/*
private Map<VoParam, String[]> collectSodaParams(HttpServletRequest req)
{
Map<VoParam, String[]> params = new HashMap<VoParam, String[]>();
for(VoParam paramToken : VoParam.values())
{
String[] paramValue = req.getParameterValues(paramToken.toString());
params.put(paramToken, paramValue);
}
return params;
}
*/
protected
void
convertHttpToSoda
(
HttpServletRequest
request
,
HttpServletResponse
response
)
...
...
@@ -301,30 +285,6 @@ public class ServletCutout extends javax.servlet.http.HttpServlet
try
{
/*/Map<SodaParam, String[]> params = collectSodaParams(request);
SodaParser parser = new SodaParser(params);
String id = null;
Pos pos = null;
Band band = null;
Time time = null;
Pol pol = null;
if(parser.sodaReq_hasSodaId())
{
id = parser.sodaReq_getId();
pos = parser.sodaReq_getPosCirclePolygon();
band = parser.sodaReq_getBand();
time = parser.sodaReq_getTime();
pol = parser.sodaReq_getPol();
}
else
{
id = parser.vlkbReq_getPubdid();
pos = parser.vlkbReq_getCircleRect();
band = parser.vlkbReq_getVelocity();
}
*/
Map
<
String
,
String
[]>
params
=
request
.
getParameterMap
();
String
id
=
SingleStringParam
.
parseSingleStringParam
(
params
,
"ID"
);
...
...
@@ -333,12 +293,6 @@ public class ServletCutout extends javax.servlet.http.HttpServlet
Time
time
=
Time
.
parseTime
(
params
,
DEFAULT_TIME_SYSTEM
);
Pol
pol
=
Pol
.
parsePol
(
params
);
String
respFormat
=
sodaReq_getResponseFormat
(
request
,
DEFAULT_RESPONSEFORMAT
);
LOGGER
.
info
(
"responseFormat: "
+
respFormat
);
...
...
This diff is collapsed.
Click to expand it.
docker/example-compose-ska-soda.yaml
+
4
−
4
View file @
959acc40
...
...
@@ -5,8 +5,8 @@ services:
ska
:
container_name
:
ska
#image: git.ia2.inaf.it:5050/butora/vlkb-datasets/soda:latest
image
:
registry.gitlab.com/ska-telescope/src/visivo-vlkb-soda:1.5.6
#
image: soda:latest
#
image: registry.gitlab.com/ska-telescope/src/visivo-vlkb-soda:1.5.6
image
:
soda:latest
ports
:
-
18019:8080
environment
:
...
...
@@ -23,8 +23,8 @@ services:
ska-ssl
:
container_name
:
ska-ssl
#image: git.ia2.inaf.it:5050/butora/vlkb-datasets/soda:latest
image
:
registry.gitlab.com/ska-telescope/src/visivo-vlkb-soda:1.5.6
#
image: soda:latest
#
image: registry.gitlab.com/ska-telescope/src/visivo-vlkb-soda:1.5.6
image
:
soda:latest
ports
:
-
18025:8443
environment
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment