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

data-discovery/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
          <dependency>

                  <groupId>vo</groupId>

                  <artifactId>vlkb-volib</artifactId>

                  <version>0.9.4</version>

                  <version>0.9.5</version>

          </dependency>



          <dependency>

data-discovery/src/main/java/webapi/SearchServlet.java

+3 −6
Original line number Diff line number Diff line
@@ -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");

data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java

+2 −5
Original line number Diff line number Diff line
@@ -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);