Skip to content
Snippets Groups Projects
Commit 300126d5 authored by Robert Butora's avatar Robert Butora
Browse files

updates yo volib 0.9.5 (removes defaults from X.parseX)

parent cafa96d8
Branches
Tags
No related merge requests found
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<dependency> <dependency>
<groupId>vo</groupId> <groupId>vo</groupId>
<artifactId>vlkb-volib</artifactId> <artifactId>vlkb-volib</artifactId>
<version>0.9.4</version> <version>0.9.5</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -24,9 +24,6 @@ public class SearchServlet extends javax.servlet.http.HttpServlet ...@@ -24,9 +24,6 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
private static final SearchSettings settings = SearchSettings.getInstance("search.properties"); private static final SearchSettings settings = SearchSettings.getInstance("search.properties");
final String RESPONSE_ENCODING = "utf-8"; 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 public void init() throws ServletException
...@@ -45,9 +42,9 @@ public class SearchServlet extends javax.servlet.http.HttpServlet ...@@ -45,9 +42,9 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
Map<String, String[]> params = request.getParameterMap(); Map<String, String[]> params = request.getParameterMap();
QueryArgs qArgs = new QueryArgs(); QueryArgs qArgs = new QueryArgs();
qArgs.pos = Pos.parsePos(params, DEFAULT_SKY_SYSTEM); qArgs.pos = Pos.parsePos(params);
qArgs.band = Band.parseBand(params, DEFAULT_SPEC_SYSTEM); qArgs.band = Band.parseBand(params);
qArgs.time = Time.parseTime(params, DEFAULT_TIME_SYSTEM); qArgs.time = Time.parseTime(params);
qArgs.pol = Pol.parsePol(params); qArgs.pol = Pol.parsePol(params);
qArgs.fov = Interval.parseInterval(params, "FOV"); qArgs.fov = Interval.parseInterval(params, "FOV");
......
...@@ -42,9 +42,6 @@ public class FormatResponseFilter implements Filter ...@@ -42,9 +42,6 @@ public class FormatResponseFilter implements Filter
LOGGER.fine("REQUEST START"); LOGGER.fine("REQUEST START");
final String RESPONSE_ENCODING = "UTF-8"; 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); FormatResponseWrapper responseWrapper = new FormatResponseWrapper((HttpServletResponse) response);
...@@ -61,8 +58,8 @@ public class FormatResponseFilter implements Filter ...@@ -61,8 +58,8 @@ public class FormatResponseFilter implements Filter
PrintWriter responseWriter = ((HttpServletResponse)response).getWriter(); PrintWriter responseWriter = ((HttpServletResponse)response).getWriter();
Map<String, String[]> params = request.getParameterMap(); Map<String, String[]> params = request.getParameterMap();
Pos pos = Pos.parsePos(params, DEFAULT_SKY_SYSTEM); Pos pos = Pos.parsePos(params);
Band band = Band.parseBand(params, DEFAULT_SPEC_SYSTEM); Band band = Band.parseBand(params);
DbObstap.Obstap[] obstapArr = queryObstap(responseWrapper.getDbConnArgs(), pubdidArr, pos, band); DbObstap.Obstap[] obstapArr = queryObstap(responseWrapper.getDbConnArgs(), pubdidArr, pos, band);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment