diff --git a/data-discovery/pom.xml b/data-discovery/pom.xml index 42551caf8ec2c55af0f03b3f59fd2719faa107d6..7417c4727785d140111cbb0a684f27a6bf1a93b6 100644 --- a/data-discovery/pom.xml +++ b/data-discovery/pom.xml @@ -36,7 +36,7 @@ <dependency> <groupId>vo</groupId> <artifactId>vlkb-volib</artifactId> - <version>0.9.4</version> + <version>0.9.5</version> </dependency> <dependency> diff --git a/data-discovery/src/main/java/webapi/SearchServlet.java b/data-discovery/src/main/java/webapi/SearchServlet.java index f02e40ce430d3350f99947bb23f78c3763198996..86b1d34dd5e62973896828492a1b512feb60d316 100644 --- a/data-discovery/src/main/java/webapi/SearchServlet.java +++ b/data-discovery/src/main/java/webapi/SearchServlet.java @@ -24,9 +24,6 @@ public class SearchServlet extends javax.servlet.http.HttpServlet private static final SearchSettings settings = SearchSettings.getInstance("search.properties"); final String RESPONSE_ENCODING = "utf-8"; - final String DEFAULT_SKY_SYSTEM = "ICRS"; - final String DEFAULT_SPEC_SYSTEM = "WAVE_Barycentric"; - final String DEFAULT_TIME_SYSTEM = "MJD_UTC"; public void init() throws ServletException @@ -45,9 +42,9 @@ public class SearchServlet extends javax.servlet.http.HttpServlet Map<String, String[]> params = request.getParameterMap(); QueryArgs qArgs = new QueryArgs(); - qArgs.pos = Pos.parsePos(params, DEFAULT_SKY_SYSTEM); - qArgs.band = Band.parseBand(params, DEFAULT_SPEC_SYSTEM); - qArgs.time = Time.parseTime(params, DEFAULT_TIME_SYSTEM); + qArgs.pos = Pos.parsePos(params); + qArgs.band = Band.parseBand(params); + qArgs.time = Time.parseTime(params); qArgs.pol = Pol.parsePol(params); qArgs.fov = Interval.parseInterval(params, "FOV"); diff --git a/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java b/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java index 5143cbcae0df2c95450d47eb47329444f8a3e4e1..0a9ca7b3c8cd5e2939c6ecad43e2e293fb764bb4 100644 --- a/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java +++ b/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java @@ -42,9 +42,6 @@ public class FormatResponseFilter implements Filter LOGGER.fine("REQUEST START"); final String RESPONSE_ENCODING = "UTF-8"; - final String DEFAULT_SKY_SYSTEM = "ICRS"; // FIXME use enums - final String DEFAULT_SPEC_SYSTEM = "WAVE_Barycentric";// FIXME use enum ALSO in SearchServlet - FormatResponseWrapper responseWrapper = new FormatResponseWrapper((HttpServletResponse) response); @@ -61,8 +58,8 @@ public class FormatResponseFilter implements Filter PrintWriter responseWriter = ((HttpServletResponse)response).getWriter(); Map<String, String[]> params = request.getParameterMap(); - Pos pos = Pos.parsePos(params, DEFAULT_SKY_SYSTEM); - Band band = Band.parseBand(params, DEFAULT_SPEC_SYSTEM); + Pos pos = Pos.parsePos(params); + Band band = Band.parseBand(params); DbObstap.Obstap[] obstapArr = queryObstap(responseWrapper.getDbConnArgs(), pubdidArr, pos, band);