diff --git a/data-access/servlet/src/main/java/webapi/ServletCutout.java b/data-access/servlet/src/main/java/webapi/ServletCutout.java index 2a0a826cac4fca358e1373706e5e73f4e1e16685..be98798a31be209cc4cc8b8e3bd9325840aa403d 100644 --- a/data-access/servlet/src/main/java/webapi/ServletCutout.java +++ b/data-access/servlet/src/main/java/webapi/ServletCutout.java @@ -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); diff --git a/docker/example-compose-ska-soda.yaml b/docker/example-compose-ska-soda.yaml index ddc66c740ff9a95a92cf955fa35e6af3af49097e..cd555e7948d57b8895e3bdfe3b8a99e971c52384 100644 --- a/docker/example-compose-ska-soda.yaml +++ b/docker/example-compose-ska-soda.yaml @@ -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: