Commit 590ee83f authored by Robert Butora's avatar Robert Butora
Browse files

adds all SIAv2-specific params for parsing (not used yet in SQL-query)

parent c1eaa91c

data-discovery/src/main/java/vlkb/common/Coord.java

+2 −5
Original line number Original line Diff line number Diff line
@@ -9,8 +9,6 @@ class Coord 
   Pol  pol;

   Pol  pol;









/* TBD: SIAv2



   Interval fov;

   Interval fov;

   Interval spatres;

   Interval spatres;

   Interval specrp;

   Interval specrp;
@@ -27,9 +25,8 @@ class Coord 
   Integer calib; // 0,1,..,5

   Integer calib; // 0,1,..,5





   String target;

   String target;

   Stirng format; // access_format MIME or DataLink MIME

   String format; // access_format MIME or DataLink MIME



                  //

   Integer maxrec; // implement oveflow and special case maxrec=0

   Integer maxrec; // implement oveflow and special case maxrec=0

*/

}

}

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

+23 −2
Original line number Original line Diff line number Diff line
@@ -68,15 +68,36 @@ public class SearchServlet extends javax.servlet.http.HttpServlet 
         //Coord       coord = new Coord(params);

         //Coord       coord = new Coord(params);

         SubsurveyId subsurveyId = new SubsurveyId(params);

         SubsurveyId subsurveyId = new SubsurveyId(params);





// FIXME check this!            String id   = SingleStringParam.parseSingleStringParam(params, "ID");





         // new based on vlkb-volib

         Coord coord = new Coord();

         Coord coord = new Coord();

         coord.pos  = Pos.parsePos(params, DEFAULT_SKY_SYSTEM);

         coord.pos  = Pos.parsePos(params, DEFAULT_SKY_SYSTEM);

         coord.band = Band.parseBand(params, DEFAULT_SPEC_SYSTEM);

         coord.band = Band.parseBand(params, DEFAULT_SPEC_SYSTEM);

         coord.time = Time.parseTime(params, DEFAULT_TIME_SYSTEM);

         coord.time = Time.parseTime(params, DEFAULT_TIME_SYSTEM);

         coord.pol  = Pol.parsePol(params);

         coord.pol  = Pol.parsePol(params);





         coord.fov     = Interval.parseInterval(params, "FOV");

         coord.spatres = Interval.parseInterval(params, "SPATRES");

         coord.specrp  = Interval.parseInterval(params, "SPECRP");

         coord.exptime = Interval.parseInterval(params, "EXPTIME");

         coord.timeres = Interval.parseInterval(params, "TIMERES");



         coord.id = SingleStringParam.parseSingleStringParam(params, "ID");



         coord.collection = SingleStringParam.parseSingleStringParam(params, "COLLECTION");

         coord.facility   = SingleStringParam.parseSingleStringParam(params, "FACILITY");

         coord.instrument = SingleStringParam.parseSingleStringParam(params, "INSTRUMENT");

         coord.dptype     = SingleStringParam.parseSingleStringParam(params, "DPTYPE");



         coord.target = SingleStringParam.parseSingleStringParam(params, "TARGET");

         coord.format = SingleStringParam.parseSingleStringParam(params, "FORMAT");



         coord.calib  = Integer.parseInt(SingleStringParam.parseSingleStringParam(params, "CALIB"));

         coord.maxrec = Integer.parseInt(SingleStringParam.parseSingleStringParam(params, "MAXREC"));

         // FIXME implement checks (?in vlkb-volib?): 0<= calib <=5 and maxrec >= 0



         // FIXME add to SQL-query params starting from fov ...





         /* query Obscore table */

         /* query Obscore table */





         DbPSearch dbps;

         DbPSearch dbps;